finishing-a-development-branch

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.

If tests fail: stop and report failures.

Step 2: Determine Base Branch

Detect likely base branch or ask if unclear.

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?

Step 4: Execute Choice

Option 1: Merge Locally

• Switch to base branch
• Pull latest
• Merge feature branch
• Verify tests on merged result
• Delete branch if safe

Option 2: Push and Create PR

• Push branch
• Create PR

Option 3: Keep As-Is

• Report that branch is preserved

Option 4: Discard

• Confirm first with exact discard confirmation
• Delete branch only after confirmation

Step 5: Cleanup Worktree

For options 1, 2, 4: cleanup if appropriate. For option 3: keep worktree.

Red Flags

Never:

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