git:20260501.402017b to git:20260501.de63568
33 added, 182 removed. Audit A to A.
---
name: finishing-a-development-branch
description: 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
---
- # Finishing a Development Branch
-
- ## Overview
-
- Guide completion of development work by presenting clear options and handling chosen workflow.
-
- **Core principle:** Verify tests → Present options → Execute choice → Clean up.
-
- **Announce at start:** "I'm using the finishing-a-development-branch skill to complete this work."
-
- ## The Process
-
- ### Step 1: Verify Tests
-
- **Before presenting options, verify tests pass:**
-
- ```bash
- # Run project's test suite
- npm test / cargo test / pytest / go test ./...
- ```
-
- **If tests fail:**
- ```
- Tests failing (<N> failures). Must fix before completing:
-
- [Show failures]
-
- Cannot proceed with merge/PR until tests pass.
- ```
-
- Stop. Don't proceed to Step 2.
-
- **If tests pass:** Continue to Step 2.
-
- ### Step 2: Determine Base Branch
-
- ```bash
- # Try common base branches
- git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null
- ```
-
- Or ask: "This branch split from main - is that correct?"
-
- ### Step 3: Present Options
-
- Present exactly these 4 options:
-
- ```
- Implementation complete. What would you like to do?
-
- 1. Merge back to <base-branch> locally
- 2. Push and create a Pull Request
- 3. Keep the branch as-is (I'll handle it later)
- 4. Discard this work
-
- Which option?
- ```
-
- **Don't add explanation** - keep options concise.
-
- ### Step 4: Execute Choice
-
- #### Option 1: Merge Locally
-
- ```bash
- # Switch to base branch
- git checkout <base-branch>
-
- # Pull latest
- git pull
-
- # Merge feature branch
- git merge <feature-branch>
-
- # Verify tests on merged result
- <test command>
-
- # If tests pass
- git branch -d <feature-branch>
- ```
-
- Then: Cleanup worktree (Step 5)
-
- #### Option 2: Push and Create PR
-
- ```bash
- # Push branch
- git push -u origin <feature-branch>
-
- # Create PR
- gh pr create --title "<title>" --body "$(cat <<'EOF'
- ## Summary
- <2-3 bullets of what changed>
-
- ## Test Plan
- - [ ] <verification steps>
- EOF
- )"
- ```
-
- Then: Cleanup worktree (Step 5)
-
- #### Option 3: Keep As-Is
-
- Report: "Keeping branch <name>. Worktree preserved at <path>."
-
- **Don't cleanup worktree.**
-
- #### Option 4: Discard
-
- **Confirm first:**
- ```
- This will permanently delete:
- - Branch <name>
- - All commits: <commit-list>
- - Worktree at <path>
-
- Type 'discard' to confirm.
- ```
-
- Wait for exact confirmation.
-
- If confirmed:
- ```bash
- git checkout <base-branch>
- git branch -D <feature-branch>
- ```
-
- Then: Cleanup worktree (Step 5)
-
- ### Step 5: Cleanup Worktree
-
- **For Options 1, 2, 4:**
-
- Check if in worktree:
- ```bash
- git worktree list | grep $(git branch --show-current)
- ```
-
- If yes:
- ```bash
- git worktree remove <worktree-path>
- ```
-
- **For Option 3:** Keep worktree.
+ <skill>
- ## Quick Reference
+ <purpose>
+ Guide completion of development work. Verify tests → Present options → Execute choice → Clean up.
+ </purpose>
- | Option | Merge | Push | Keep Worktree | Cleanup Branch |
- |--------|-------|------|---------------|----------------|
- | 1. Merge locally | ✓ | - | - | ✓ |
- | 2. Create PR | - | ✓ | ✓ | - |
- | 3. Keep as-is | - | - | ✓ | - |
- | 4. Discard | - | - | - | ✓ (force) |
+ <triggers>
+ <rule>Use when all tasks are complete and tests pass.</rule>
+ <rule>Use at the end of subagent-driven-development or executing-plans.</rule>
+ </triggers>
- ## Common Mistakes
+ <warning level="soft">
+ Announce at start: "I'm using the finishing-a-development-branch skill to complete this work."
+ </warning>
- **Skipping test verification**
- - **Problem:** Merge broken code, create failing PR
- - **Fix:** Always verify tests before offering options
+ <process>
+ <step>**Verify tests** — Run project's test suite. If tests fail: show failures, stop. Cannot proceed until green.</step>
+ <step>**Determine base branch** — `git merge-base HEAD main` or ask.</step>
+ <step>**Present exactly 4 options** — (1) Merge locally, (2) Push and create PR, (3) Keep branch as-is, (4) Discard. No explanation — keep concise.</step>
+ <step>**Execute choice** — see option details below.</step>
+ <step>**Cleanup worktree** — For options 1, 2, 4: `git worktree remove <path>`. For option 3: keep.</step>
+ </process>
- **Open-ended questions**
- - **Problem:** "What should I do next?" → ambiguous
- - **Fix:** Present exactly 4 structured options
+ ## Option details
- **Automatic worktree cleanup**
- - **Problem:** Remove worktree when might need it (Option 2, 3)
- - **Fix:** Only cleanup for Options 1 and 4
+ **1. Merge locally:** checkout base → pull → merge feature branch → verify tests on merged result → delete feature branch.
- **No confirmation for discard**
- - **Problem:** Accidentally delete work
- - **Fix:** Require typed "discard" confirmation
+ **2. Push and create PR:** push branch with `-u` → `gh pr create` with Summary + Test Plan.
- ## Red Flags
+ **3. Keep as-is:** Report branch name and worktree path. Don't cleanup.
- **Never:**
- - Proceed with failing tests
- - Merge without verifying tests on result
- - Delete work without confirmation
- - Force-push without explicit request
+ **4. Discard:** Confirm first (show branch, commits, worktree path). Require typed "discard". Then: checkout base → force-delete feature branch → remove worktree.
- **Always:**
- - Verify tests before offering options
- - Present exactly 4 options
- - Get typed confirmation for Option 4
- - Clean up worktree for Options 1 & 4 only
+ <rules>
+ <rule>Never proceed with failing tests.</rule>
+ <rule>Never merge without verifying tests on result.</rule>
+ <rule>Never delete work without typed confirmation.</rule>
+ <rule>Never force-push without explicit request.</rule>
+ </rules>
- ## Integration
+ ## Integration
- **Called by:**
- - **subagent-driven-development** (Step 7) - After all tasks complete
- - **executing-plans** (Step 5) - After all batches complete
+ **Called by:** bp:subagent-driven-development (after all tasks), bp:executing-plans (after all batches).
+ **Pairs with:** bp:using-git-worktrees (cleans up worktree created by that skill).
- **Pairs with:**
- - **using-git-worktrees** - Cleans up worktree created by that skill
+ </skill>