fix(finishing): don't cleanup worktree when creating PR#913
fix(finishing): don't cleanup worktree when creating PR#913chris-yyau wants to merge 1 commit intoobra:mainfrom
Conversation
Step 5 listed Options 1, 2, 4 for worktree cleanup, but the Quick Reference table (line 157), Common Mistakes section (line 173), and Red Flags section (line 191) all agree: only Options 1 and 4 should cleanup. Option 2 (Create PR) needs the worktree preserved while the PR is under review.
There was a problem hiding this comment.
Pull request overview
This PR updates the finishing-a-development-branch skill documentation to ensure worktree cleanup guidance matches the intended workflow—specifically that creating a PR should preserve the worktree while it’s under review.
Changes:
- Updated Step 5 “Cleanup Worktree” to specify cleanup applies to Options 1 and 4 (not Option 2).
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| ### Step 5: Cleanup Worktree | ||
|
|
||
| **For Options 1, 2, 4:** | ||
| **For Options 1 and 4:** | ||
|
|
||
| Check if in worktree: |
There was a problem hiding this comment.
Step 5 now says cleanup is only for Options 1 and 4, but Option 2 still ends with “Then: Cleanup worktree (Step 5)”. With this change, following Option 2’s flow leads to a contradictory instruction. Consider updating Step 4’s Option 2 section to not direct users to Step 5, or add an explicit “For Option 2: keep worktree” note in Step 5 to remove ambiguity.
What problem are you trying to solve?
Step 5 "Cleanup Worktree" in
finishing-a-development-branch/SKILL.mdlists Options 1, 2, 4 for worktree cleanup. But three other sections in the same document disagree:When a user picks Option 2 (Create PR), the agent cleans up the worktree — but the user may still need it while the PR is under review. This contradicts the document's own guidance.
What does this PR change?
Updates Step 5 to cleanup worktree for Options 1 and 4 only, matching the Quick Reference table, Common Mistakes, and Red Flags sections.
Is this change appropriate for the core library?
Yes — this fixes an internal contradiction in a core skill document. The finishing skill is general-purpose infrastructure used by all users.
What alternatives did you consider?
Does this PR contain multiple unrelated changes?
No. Single line change fixing one contradiction.
Existing PRs
Environment tested
Evaluation
Rigor
superpowers:writing-skillsand completed adversarial pressure testing (paste results below)This change aligns Step 5 with the existing Red Flags and Common Mistakes tables — it does not modify their content.
Human review