Require Post-Merge Worktree Cleanup - #873
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the fleet skill documentation to make post-merge worktree/branch cleanup a required terminal step, including special handling for squash merges and restoring the base clone to a fetched, fast-forwarded develop.
Changes:
- Expand
repo-worktreeto require verified post-merge cleanup (including a narrowgit branch -Dpost-squash exception with live PR + clean-tree proof). - Require the post-merge cleanup procedure as part of the PR review loop and after promotions/releases.
- Sync these rule changes across the
.github/skills,.agents/skills, and.claude-pluginskill distributions (including digest update).
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 12 comments.
Show a summary per file
| File | Description |
|---|---|
| .github/skills/repo-worktree/SKILL.md | Defines the required post-merge cleanup and base-clone reset to develop. |
| .github/skills/pr-review-conduct/SKILL.md | Makes cleanup part of the required post-merge PR loop completion. |
| .github/skills/operational-vs-release-workflow/SKILL.md | Requires cleanup after squash merges and after promotion/release completion. |
| .github/skills/git-commit-conventions/SKILL.md | Clarifies destructive-command policy and documents the narrow post-squash branch deletion exception. |
| .claude-plugin/fleet-skills/skills/repo-worktree/SKILL.md | Synced plugin distribution copy of repo-worktree. |
| .claude-plugin/fleet-skills/skills/pr-review-conduct/SKILL.md | Synced plugin distribution copy of pr-review-conduct. |
| .claude-plugin/fleet-skills/skills/operational-vs-release-workflow/SKILL.md | Synced plugin distribution copy of operational-vs-release-workflow. |
| .claude-plugin/fleet-skills/skills/git-commit-conventions/SKILL.md | Synced plugin distribution copy of git-commit-conventions. |
| .claude-plugin/fleet-skills/.source-digest | Updates the plugin digest to match the new skill content. |
| .agents/skills/repo-worktree/SKILL.md | Synced agent distribution copy of repo-worktree. |
| .agents/skills/pr-review-conduct/SKILL.md | Synced agent distribution copy of pr-review-conduct. |
| .agents/skills/operational-vs-release-workflow/SKILL.md | Synced agent distribution copy of operational-vs-release-workflow. |
| .agents/skills/git-commit-conventions/SKILL.md | Synced agent distribution copy of git-commit-conventions. |
💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
## Summary - Treat missing `copilot_work_started` as inconclusive for effort-labeled reviews. - Report effective Lite, Balanced, or Max metadata without changing user settings. - Keep the deprecated pickup option compatible and update the review contracts and tests. ## Verification - 729 Python tests - ruff lint and format - mypy - distribution, prose, repository, spec, and diff gates - Docker editorconfig-checker, ShellCheck, and PSScriptAnalyzer - live status read against PR #873 Related to #868.
Summary
developValidation
python3 scripts/build_dist.py --checkpython3 scripts/tests/test_build_dist.pypython3 scripts/prose_lint.py --check sentence-length --diff origin/developpython3 scripts/prose_lint.py --check sentence-split --diff origin/developmarkdownlint-cli2over 158 Markdown filesgit diff --check