Finishing A Development Branch

1---2name: finishing-a-development-branch3description: 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 cleanup4---5 6# Finishing a Development Branch7 8## Overview9 10Guide completion of development work by presenting clear options and handling chosen workflow.11 12**Core principle:** Verify tests → 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 Process17 18### Step 1: Verify Tests19 20**Before presenting options, verify tests pass:**21 22```bash23# Run project's test suite24npm 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: Determine Base Branch41 42```bash43# Try common base branches44git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null45```46 47Or ask: "This branch split from main - is that correct?"48 49### Step 3: Present Options50 51Present exactly these 4 options:52 53```54Implementation complete. What would you like to do?55 561. Merge back to <base-branch> locally572. Push and create a Pull Request583. Keep the branch as-is (I'll handle it later)594. Discard this work60 61Which option?62```63 64**Don't add explanation** - keep options concise.65 66### Step 4: Execute Choice67 68#### Option 1: Merge Locally69 70```bash71# Switch to base branch72git checkout <base-branch>73 74# Pull latest75git pull76 77# Merge feature branch78git merge <feature-branch>79 80# Verify tests on merged result81<test command>82 83# If tests pass84git branch -d <feature-branch>85```86 87Then: Cleanup worktree (Step 5)88 89#### Option 2: Push and Create PR90 91```bash92# Push branch93git push -u origin <feature-branch>94 95# Create PR96gh pr create --title "<title>" --body "$(cat <<'EOF'97## Summary98<2-3 bullets of what changed>99 100## Test Plan101- [ ] <verification steps>102EOF103)"104```105 106Then: Cleanup worktree (Step 5)107 108#### Option 3: Keep As-Is109 110Report: "Keeping branch <name>. Worktree preserved at <path>."111 112**Don't cleanup worktree.**113 114#### Option 4: Discard115 116**Confirm first:**117```118This will permanently delete:119- Branch <name>120- All commits: <commit-list>121- Worktree at <path>122 123Type 'discard' to confirm.124```125 126Wait for exact confirmation.127 128If confirmed:129```bash130git checkout <base-branch>131git branch -D <feature-branch>132```133 134Then: Cleanup worktree (Step 5)135 136### Step 5: Cleanup Worktree137 138**For Options 1, 2, 4:**139 140Check if in worktree:141```bash142git worktree list | grep $(git branch --show-current)143```144 145If yes:146```bash147git worktree remove <worktree-path>148```149 150**For Option 3:** Keep worktree.151 152## Quick Reference153 154| Option | Merge | Push | Keep Worktree | Cleanup Branch |155|--------|-------|------|---------------|----------------|156| 1. Merge locally | ✓ | - | - | ✓ |157| 2. Create PR | - | ✓ | ✓ | - |158| 3. Keep as-is | - | - | ✓ | - |159| 4. Discard | - | - | - | ✓ (force) |160 161## Common Mistakes162 163**Skipping test verification**164- **Problem:** Merge broken code, create failing PR165- **Fix:** Always verify tests before offering options166 167**Open-ended questions**168- **Problem:** "What should I do next?" → ambiguous169- **Fix:** Present exactly 4 structured options170 171**Automatic worktree cleanup**172- **Problem:** Remove worktree when might need it (Option 2, 3)173- **Fix:** Only cleanup for Options 1 and 4174 175**No confirmation for discard**176- **Problem:** Accidentally delete work177- **Fix:** Require typed "discard" confirmation178 179## Red Flags180 181**Never:**182- Proceed with failing tests183- Merge without verifying tests on result184- Delete work without confirmation185- Force-push without explicit request186 187**Always:**188- Verify tests before offering options189- Present exactly 4 options190- Get typed confirmation for Option 4191- Clean up worktree for Options 1 & 4 only192 193## Integration194 195**Called by:**196- **subagent-driven-development** (Step 7) - After all tasks complete197- **executing-plans** (Step 5) - After all batches complete198 199**Pairs with:**200- **using-git-worktrees** - Cleans up worktree created by that skill