finishing-branch_skill

Overview

This skill helps you finish a development branch by verifying tests, offering a concise set of integration choices, and executing the chosen workflow (merge, create PR, keep, or discard). It is designed to be used when implementation is complete and tests have passed, guiding safe cleanup of branches and worktrees. The skill enforces confirmations for destructive actions and prevents advancing while tests fail.

How this skill works

It first checks that tests pass and halts if any failures are detected. It determines the likely base branch, then presents exactly four structured options: merge locally, push and create a PR, keep the branch, or discard the branch. Based on the selected option it runs the appropriate git and CLI steps, requests typed confirmation for destructive deletes, and performs worktree cleanup when applicable.

When to use it

• Implementation is complete and you’ve run tests
• All tests pass and you’re ready to integrate changes
• You need a clear decision to merge, create a PR, preserve, or discard work
• After finishing a feature and wanting a safe cleanup workflow
• When coordinating branch closure across teammates

Best practices

• Always run the full test suite before proceeding; stop on failures
• Confirm the correct base branch (main or master) before merging
• Use the provided four-option prompt—do not skip options or ask open-ended questions
• Require typed confirmation ‘discard’ before any permanent deletion
• Re-run tests after a local merge to verify integration before deleting the feature branch

Example use cases

• Finish a feature branch: verify tests, push a PR with a concise summary and test plan
• Hotfix that must be merged locally: merge into base branch, run tests, then delete branch and remove worktree
• Evaluate unfinished work: choose ‘keep as-is’ to preserve the branch and worktree for later
• Abandon experimental work: confirm discard, delete the branch and its worktree after confirmation