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

Run npm test / cargo test / pytest / go test ./... If tests fail: Show failures, stop. Cannot proceed until tests pass.

Step 2: Determine Base Branch

git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null

Step 3: Present Options

Present exactly these 4 options (no explanation):

1. Merge back to locally
2. Push and create a Pull Request
3. Keep the branch as-is (I'll handle it later)
4. Discard this work

Step 4: Execute Choice

Option	Commands
1. Merge Locally	git checkout <base> → git pull → git merge <feature> → verify tests → git branch -d <feature> → Cleanup worktree
2. Create PR	git push -u origin <feature> → gh pr create --title "..." --body "## Summary..." → Cleanup worktree
3. Keep As-Is	Report: "Keeping branch . Worktree preserved at ." Don't cleanup.
4. Discard	Confirm first: "Type 'discard' to confirm." → git checkout <base> → git branch -D <feature> → Cleanup worktree

Step 5: Cleanup Worktree

Options 1, 2, 4: git worktree list | grep $(git branch --show-current) → if in worktree: git worktree remove <path> Option 3: Keep worktree.

Quick Reference

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

Common Mistakes

Mistake	Problem	Fix
Skipping test verification	Merge broken code, create failing PR	Always verify tests before offering options
Open-ended questions	"What should I do next?" → ambiguous	Present exactly 4 structured options
Automatic worktree cleanup	Remove worktree when might need it	Only cleanup for Options 1 and 4
No confirmation for discard	Accidentally delete work	Require typed "discard" confirmation

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
• Present exactly 4 options
• Get typed confirmation for Option 4
• Clean up worktree for Options 1 & 4 only

Integration

Called by:

• ring:subagent-driven-development (Step 7) - After all tasks complete
• ring:executing-plans (Step 5) - After all batches complete

Pairs with:

• ring:using-git-worktrees - Cleans up worktree created by that skill

Blocker Criteria

STOP and report if:

Decision Type	Blocker Condition	Required Action
Test Verification	Tests fail or test command not found	STOP and report - CANNOT proceed until tests pass
Base Branch	Cannot determine base branch (main or master)	STOP and ask user which branch to merge into
Git State	Uncommitted changes exist in working directory	STOP and report - MUST commit or stash changes first
Merge Conflict	Git merge results in conflicts	STOP and report conflicts - user MUST resolve

Cannot Be Overridden

The following requirements CANNOT be waived:

• MUST verify tests pass before offering any completion options
• MUST present exactly 4 options - no improvised alternatives
• MUST require typed "discard" confirmation for Option 4 - no shortcuts
• CANNOT force-push without explicit user request and confirmation

Severity Calibration

Severity	Condition	Required Action
CRITICAL	Tests failing in feature branch	MUST fix tests before any merge/PR option
HIGH	Merge to base branch introduces test failures	MUST abort merge and report - tests must pass post-merge
MEDIUM	Worktree cleanup fails after successful merge	Should report warning but consider completion successful
LOW	Branch deletion fails after merge	Fix in next iteration - code is already merged

Pressure Resistance

User Says	Your Response
"Just merge it, I'll fix the tests later"	"CANNOT proceed with failing tests. Tests MUST pass before offering merge options. This prevents broken code from reaching the base branch."
"Skip the test verification, I know it works"	"I MUST run test verification. 'Knowing it works' is not evidence - actual test output is required before proceeding."
"Delete the branch without confirmation"	"CANNOT delete work without typed 'discard' confirmation. Type 'discard' to confirm you want to permanently delete this branch."

Anti-Rationalization Table

Rationalization	Why It's WRONG	Required Action
"Tests were passing earlier, skip verification"	Tests can break between commits. Current state must be verified, not assumed.	MUST run tests before offering options
"User is experienced, skip the 4-option prompt"	Structured options prevent mistakes. User experience doesn't justify skipping workflow.	MUST present exactly 4 options
"Small change, discard confirmation is overkill"	Size doesn't determine value. Any work deserves explicit discard confirmation.	MUST require typed 'discard' for Option 4
"Worktree cleanup failed but merge succeeded"	Cleanup failure leaves orphan state. Report it even if merge completed.	MUST report cleanup failures