1---
2name: finishing-a-development-branch
3description: Use when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for merge, PR, or cleanup
4---
5 
6# Finishing a Development Branch
7 
8## Overview
9 
10Guide completion of development work by presenting clear options and handling chosen workflow.
11 
12**Core principle:** Verify tests → Detect environment → Present options → Execute choice → Clean up.
13 
14**Announce at start:** "I'm using the finishing-a-development-branch skill to complete this work."
15 
16## The Process
17 
18### Step 1: Verify Tests
19 
20**Before presenting options, verify tests pass:**
21 
22```bash
23# Run project's test suite
24npm test / cargo test / pytest / go test ./...
25```
26 
27**If tests fail:**
28```
29Tests failing (<N> failures). Must fix before completing:
30 
31[Show failures]
32 
33Cannot proceed with merge/PR until tests pass.
34```
35 
36Stop. Don't proceed to Step 2.
37 
38**If tests pass:** Continue to Step 2.
39 
40### Step 2: Detect Environment
41 
42**Determine workspace state before presenting options:**
43 
44```bash
45GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)
46GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" 2>/dev/null && pwd -P)
47```
48 
49This determines which menu to show and how cleanup works:
50 
51| State | Menu | Cleanup |
52|-------|------|---------|
53| `GIT_DIR == GIT_COMMON` (normal repo) | Standard 4 options | No worktree to clean up |
54| `GIT_DIR != GIT_COMMON`, named branch | Standard 4 options | Provenance-based (see Step 6) |
55| `GIT_DIR != GIT_COMMON`, detached HEAD | Reduced 3 options (no merge) | No cleanup (externally managed) |
56 
57### Step 3: Determine Base Branch
58 
59```bash
60# Try common base branches
61git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null
62```
63 
64Or ask: "This branch split from main - is that correct?"
65 
66### Step 4: Present Options
67 
68**Normal repo and named-branch worktree — present exactly these 4 options:**
69 
70```
71Implementation complete. What would you like to do?
72 
731. Merge back to <base-branch> locally
742. Push and create a Pull Request
753. Keep the branch as-is (I'll handle it later)
764. Discard this work
77 
78Which option?
79```
80 
81**Detached HEAD — present exactly these 3 options:**
82 
83```
84Implementation complete. You're on a detached HEAD (externally managed workspace).
85 
861. Push as new branch and create a Pull Request
872. Keep as-is (I'll handle it later)
883. Discard this work
89 
90Which option?
91```
92 
93**Don't add explanation** - keep options concise.
94 
95### Step 5: Execute Choice
96 
97#### Option 1: Merge Locally
98 
99```bash
100# Get main repo root for CWD safety
101MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
102cd "$MAIN_ROOT"
103 
104# Merge first — verify success before removing anything
105git checkout <base-branch>
106git pull
107git merge <feature-branch>
108 
109# Verify tests on merged result
110<test command>
111 
112# Only after merge succeeds: cleanup worktree (Step 6), then delete branch
113```
114 
115Then: Cleanup worktree (Step 6), then delete branch:
116 
117```bash
118git branch -d <feature-branch>
119```
120 
121#### Option 2: Push and Create PR
122 
123```bash
124# Push branch
125git push -u origin <feature-branch>
126 
127# Create PR
128gh pr create --title "<title>" --body "$(cat <<'EOF'
129## Summary
130<2-3 bullets of what changed>
131 
132## Test Plan
133- [ ] <verification steps>
134EOF
135)"
136```
137 
138**Do NOT clean up worktree** — user needs it alive to iterate on PR feedback.
139 
140#### Option 3: Keep As-Is
141 
142Report: "Keeping branch <name>. Worktree preserved at <path>."
143 
144**Don't cleanup worktree.**
145 
146#### Option 4: Discard
147 
148**Confirm first:**
149```
150This will permanently delete:
151- Branch <name>
152- All commits: <commit-list>
153- Worktree at <path>
154 
155Type 'discard' to confirm.
156```
157 
158Wait for exact confirmation.
159 
160If confirmed:
161```bash
162MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
163cd "$MAIN_ROOT"
164```
165 
166Then: Cleanup worktree (Step 6), then force-delete branch:
167```bash
168git branch -D <feature-branch>
169```
170 
171### Step 6: Cleanup Workspace
172 
173**Only runs for Options 1 and 4.** Options 2 and 3 always preserve the worktree.
174 
175```bash
176GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)
177GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" 2>/dev/null && pwd -P)
178WORKTREE_PATH=$(git rev-parse --show-toplevel)
179```
180 
181**If `GIT_DIR == GIT_COMMON`:** Normal repo, no worktree to clean up. Done.
182 
183**If worktree path is under `.worktrees/`, `worktrees/`, or `~/.config/superpowers/worktrees/`:** Superpowers created this worktree — we own cleanup.
184 
185```bash
186MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
187cd "$MAIN_ROOT"
188git worktree remove "$WORKTREE_PATH"
189git worktree prune  # Self-healing: clean up any stale registrations
190```
191 
192**Otherwise:** The host environment (harness) owns this workspace. Do NOT remove it. If your platform provides a workspace-exit tool, use it. Otherwise, leave the workspace in place.
193 
194## Quick Reference
195 
196| Option | Merge | Push | Keep Worktree | Cleanup Branch |
197|--------|-------|------|---------------|----------------|
198| 1. Merge locally | yes | - | - | yes |
199| 2. Create PR | - | yes | yes | - |
200| 3. Keep as-is | - | - | yes | - |
201| 4. Discard | - | - | - | yes (force) |
202 
203## Common Mistakes
204 
205**Skipping test verification**
206- **Problem:** Merge broken code, create failing PR
207- **Fix:** Always verify tests before offering options
208 
209**Open-ended questions**
210- **Problem:** "What should I do next?" is ambiguous
211- **Fix:** Present exactly 4 structured options (or 3 for detached HEAD)
212 
213**Cleaning up worktree for Option 2**
214- **Problem:** Remove worktree user needs for PR iteration
215- **Fix:** Only cleanup for Options 1 and 4
216 
217**Deleting branch before removing worktree**
218- **Problem:** `git branch -d` fails because worktree still references the branch
219- **Fix:** Merge first, remove worktree, then delete branch
220 
221**Running git worktree remove from inside the worktree**
222- **Problem:** Command fails silently when CWD is inside the worktree being removed
223- **Fix:** Always `cd` to main repo root before `git worktree remove`
224 
225**Cleaning up harness-owned worktrees**
226- **Problem:** Removing a worktree the harness created causes phantom state
227- **Fix:** Only clean up worktrees under `.worktrees/`, `worktrees/`, or `~/.config/superpowers/worktrees/`
228 
229**No confirmation for discard**
230- **Problem:** Accidentally delete work
231- **Fix:** Require typed "discard" confirmation
232 
233## Red Flags
234 
235**Never:**
236- Proceed with failing tests
237- Merge without verifying tests on result
238- Delete work without confirmation
239- Force-push without explicit request
240- Remove a worktree before confirming merge success
241- Clean up worktrees you didn't create (provenance check)
242- Run `git worktree remove` from inside the worktree
243 
244**Always:**
245- Verify tests before offering options
246- Detect environment before presenting menu
247- Present exactly 4 options (or 3 for detached HEAD)
248- Get typed confirmation for Option 4
249- Clean up worktree for Options 1 & 4 only
250- `cd` to main repo root before worktree removal
251- Run `git worktree prune` after removal
252