finishing-a-development-branch

Finishing Development Work

Overview

Guide completion of development work in a no-branch flow.

Core principle: Verify tests → summarize changes → ask for commit decision.

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

The Process

Step 1: Verify Tests

Before finalizing, verify tests pass:

# Run project's test suite
npm test / cargo test / pytest / go test ./...

If tests fail:

Tests failing (<N> failures). Must fix before completing:

[Show failures]

Cannot finalize this work until tests pass.

Stop. Don't proceed to Step 2.

If tests pass: Continue to Step 2.

Step 2: Confirm Branch Policy

# Must be main or master
git branch --show-current

If not on main or master, stop and ask the user how to proceed.

Step 3: Present Completion Options

Present exactly these 2 options:

Implementation complete on <current-branch>. What would you like to do?

1. Commit changes now on <current-branch>
2. Keep changes uncommitted for now

Which option?

Don't add explanation - keep options concise.

Step 4: Execute Choice

Option 1: Commit on Current Branch

git add <relevant-files>
git commit -m "<message>"

Option 2: Keep Uncommitted

Report: "Keeping changes uncommitted on ."

Quick Reference

Option	Commit	Leave Uncommitted
1. Commit now	✓	-
2. Keep as-is	-	✓

Common Mistakes

Skipping test verification

• Problem: Merge broken code, create failing PR
• Fix: Always verify tests before offering options

Open-ended questions

• Problem: "What should I do next?" → ambiguous
• Fix: Present exactly 2 structured options

Red Flags

Never:

• Proceed with failing tests
• Create feature branches for this flow
• Create or remove git worktrees
• Force-push without explicit request

Always:

• Verify tests before offering options
• Confirm current branch is main or master
• Present exactly 2 options

Integration

Called by:

• executing-plans - After all tasks complete

Pairs with:

• requesting-code-review - Review completed work before final handoff