3.4 KiB

Raw Blame History

name	description
finishing-a-development-branch	Use when implementation is complete, all tests pass, and you need to decide how to integrate the work

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:

npm run test

If tests fail:

Tests failing. 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.

Also run lint and build checks:

npm run lint
npm run build

Step 2: Determine Base Branch

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 main 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?

Step 4: Execute Choice

Option 1: Merge Locally

git checkout main
git pull origin main
git merge <feature-branch>
git push origin main
git branch -d <feature-branch>

Then: Cleanup worktree (Step 5)

Option 2: Push and Create PR

git push -u origin <feature-branch>
gh pr create --title "<title>" --body "$(cat <<'EOF'
## Summary
<2-3 bullets of what changed>
## Test Plan
- [ ] <verification steps>
EOF
)"

Then: Cleanup worktree if applicable (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:

git checkout main
git branch -D <feature-branch>

Then: Cleanup worktree (Step 5)

Step 5: Cleanup Worktree

Check if in worktree:

git worktree list | grep $(git branch --show-current)

If yes, remove it:

git worktree remove <worktree-path>

For Option 3 (Keep As-Is): Keep worktree, don't cleanup.

Quick Reference

Option	Merge	Push	Keep Worktree	Cleanup Branch
1. Merge locally	✓	-	-	✓
2. Create PR	-	✓	✓	-
3. Keep as-is	-	-	✓	-
4. Discard	-	-	-	✓ (force)

Red Flags

Never:

Proceed with failing tests
Merge without verifying tests on result
Delete work without confirmation
Force-push without explicit request

Always:

Verify tests before offering options
Run lint and build checks before offering options
Present exactly 4 options
Get typed confirmation for Option 4
Clean up worktree for Options 1 & 4 only

Integration

Called by:

subagent-driven-development — After all tasks complete
executing-plans — After all batches complete

Pairs with:

using-git-worktrees — Cleans up worktree created by that skill

3.4 KiB Raw Blame History