Finish Branch

Guide completion of development work with structured options.

When to Use

• Implementation is complete
• All tests pass
• Ready to integrate or discard work

Process

Step 1: Verify Tests

npm test / cargo test / pytest / go test ./...

Tests fail? Stop. Fix before proceeding.

Step 2: Detect Environment

GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)
GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" 2>/dev/null && pwd -P)

Step 3: Present Options

Normal repo or named-branch worktree:

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?

Detached HEAD (3 options):

1. Push as new branch and create a Pull Request
2. Keep as-is (I'll handle it later)
3. Discard this work

Step 4: Execute

Step 5: Cleanup (Options 1 & 4 only)

# From main repo root
git worktree remove <worktree-path>
git worktree prune

Rules

• Verify tests before presenting options
• Get typed confirmation for discard
• Don't clean up worktree for Option 2 (PR needs it)
• Don't run git worktree remove from inside the worktree
• Always cd to main repo root first