domains / families / software-engineering / finishing-a-development-branch

finishing-a-development-branch

combined

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 Use when implementation is complete, all tests pass, and you need to decide how to integrate the work

When to use

When not to use

Skill page

Conflict

The obra/superpowers copy is the more complete, environment-aware procedure (detects worktree vs normal repo, handles detached HEAD, and preserves the worktree for PRs). The other three copies are near-identical simplified variants that add a 4th 'Discard' option and a protected-branch check, but they disagree with the superpowers copy on when to clean up the worktree (they remove it for PRs; superpowers keeps it) and on whether discard is a menu option or only an explicit user request. Crowning one would hide a real alternative workflow.