Skip to content

Require Post-Merge Worktree Cleanup - #873

Merged
ptr727 merged 1 commit into
developfrom
require-post-merge-cleanup
Aug 20, 2026
Merged

Require Post-Merge Worktree Cleanup#873
ptr727 merged 1 commit into
developfrom
require-post-merge-cleanup

Conversation

@ptr727

Copy link
Copy Markdown
Owner

Summary

  • make worktree and branch cleanup a required post-merge terminal step
  • safely handle squash-merged branches through live PR and clean-tree verification
  • return the primary checkout to fetched, fast-forwarded develop
  • route PR, promotion, and release completion through the cleanup procedure

Validation

  • python3 scripts/build_dist.py --check
  • python3 scripts/tests/test_build_dist.py
  • python3 scripts/prose_lint.py --check sentence-length --diff origin/develop
  • python3 scripts/prose_lint.py --check sentence-split --diff origin/develop
  • markdownlint-cli2 over 158 Markdown files
  • git diff --check

@ptr727
ptr727 requested a lite review from Copilot and removed request for CopilotAugust 20, 2026 14:20

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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-worktree to require verified post-merge cleanup (including a narrow git branch -D post-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-plugin skill 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
FileDescription
.github/skills/repo-worktree/SKILL.mdDefines the required post-merge cleanup and base-clone reset to develop.
.github/skills/pr-review-conduct/SKILL.mdMakes cleanup part of the required post-merge PR loop completion.
.github/skills/operational-vs-release-workflow/SKILL.mdRequires cleanup after squash merges and after promotion/release completion.
.github/skills/git-commit-conventions/SKILL.mdClarifies destructive-command policy and documents the narrow post-squash branch deletion exception.
.claude-plugin/fleet-skills/skills/repo-worktree/SKILL.mdSynced plugin distribution copy of repo-worktree.
.claude-plugin/fleet-skills/skills/pr-review-conduct/SKILL.mdSynced plugin distribution copy of pr-review-conduct.
.claude-plugin/fleet-skills/skills/operational-vs-release-workflow/SKILL.mdSynced plugin distribution copy of operational-vs-release-workflow.
.claude-plugin/fleet-skills/skills/git-commit-conventions/SKILL.mdSynced plugin distribution copy of git-commit-conventions.
.claude-plugin/fleet-skills/.source-digestUpdates the plugin digest to match the new skill content.
.agents/skills/repo-worktree/SKILL.mdSynced agent distribution copy of repo-worktree.
.agents/skills/pr-review-conduct/SKILL.mdSynced agent distribution copy of pr-review-conduct.
.agents/skills/operational-vs-release-workflow/SKILL.mdSynced agent distribution copy of operational-vs-release-workflow.
.agents/skills/git-commit-conventions/SKILL.mdSynced agent distribution copy of git-commit-conventions.

💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread.github/skills/repo-worktree/SKILL.md
Comment thread.github/skills/pr-review-conduct/SKILL.md
Comment thread.github/skills/operational-vs-release-workflow/SKILL.md
Comment thread.github/skills/git-commit-conventions/SKILL.md
Comment thread.agents/skills/repo-worktree/SKILL.md
Comment thread.agents/skills/git-commit-conventions/SKILL.md
Comment thread.claude-plugin/fleet-skills/skills/repo-worktree/SKILL.md
@ptr727
ptr727 merged commit 79eed2a into developAug 20, 2026
11 checks passed
@ptr727
ptr727 deleted the require-post-merge-cleanup branch August 20, 2026 15:00
@ptr727ptr727 mentioned this pull request Aug 20, 2026
ptr727 added a commit that referenced this pull request Aug 20, 2026
## Summary
Promote the current `develop` branch to `main`.
Included change:
- require verified post-merge worktree and branch cleanup, then restore
the primary checkout to current `develop`
([#873](#873))
## Merge method
Merge commit only. Preserve `develop` after merge.
ptr727 added a commit that referenced this pull request Aug 20, 2026
## 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.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@ptr727