finishing-a-development-branch

Finishing a Development Branch

Core principle: Development isn't done until the branch is properly resolved.

Announce at start: "I'm using the finishing-a-development-branch skill to properly complete this work."

When to Use

• All planned tasks completed
• All tests passing
• Code review approved
• Ready to merge or create PR

Pre-Finish Verification

🔴 Must Verify Before Proceeding

# 1. All tests pass
npm test || yarn test || pnpm test
# Exit code must be 0

# 2. Build succeeds
npm run build || yarn build || pnpm build
# Exit code must be 0

# 3. No uncommitted changes
git status --porcelain
# Output must be empty

# 4. Branch is up to date with base
git fetch origin
git log HEAD..origin/main --oneline
# If commits exist, rebase required

If any check fails: STOP. Do not proceed until fixed.

Workflow

digraph finish_branch {
    rankdir=TB;
    
    "Verify tests pass" [shape=box];
    "Tests pass?" [shape=diamond];
    "Fix failing tests" [shape=box, style=dashed];
    "Detect base branch" [shape=box];
    "Present options" [shape=box];
    "User choice" [shape=diamond];
    "Local merge" [shape=box];
    "Create PR" [shape=box];
    "Keep branch" [shape=box];
    "Discard work" [shape=box];
    "Cleanup worktree" [shape=box];
    "Done" [shape=ellipse];
    
    "Verify tests pass" -> "Tests pass?";
    "Tests pass?" -> "Fix failing tests" [label="no"];
    "Fix failing tests" -> "Verify tests pass";
    "Tests pass?" -> "Detect base branch" [label="yes"];
    "Detect base branch" -> "Present options";
    "Present options" -> "User choice";
    "User choice" -> "Local merge" [label="merge"];
    "User choice" -> "Create PR" [label="pr"];
    "User choice" -> "Keep branch" [label="keep"];
    "User choice" -> "Discard work" [label="discard"];
    "Local merge" -> "Cleanup worktree";
    "Create PR" -> "Cleanup worktree";
    "Keep branch" -> "Done";
    "Discard work" -> "Cleanup worktree";
    "Cleanup worktree" -> "Done";
}