Featured

finishing-a-development-branch

Name: finishing-a-development-branch
Author: obra

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

TL;DR

Verify tests pass, present 4 options, execute choice, clean up worktree as needed.

What Is It

Guide completion of development work
Present structured merge/PR/keep/discard options
Ensure test verification before integration
Handle worktree cleanup based on choice

Key Features

Verify tests pass before presenting options
Present exactly 4 clear options
Require typed confirmation for discard
Clean up worktree only for merge and discard
Never proceed with failing tests
Always get typed confirmation for discard
Only clean up worktree for options 1 and 4
Must verify tests before merge or PR

How to Use

1.Verify tests pass with project's test suite
2.Determine base branch with merge-base or ask
3.Present 4 options: merge, PR, keep, discard
4.Execute chosen option with correct commands
5.Clean up worktree if applicable (options 1, 2, 4)
6.Never skip test verification or force-merge

Guardrails & Gotchas

Never: Proceed with failing tests
Never: Merge without verifying tests on result
Never: Delete work without confirmation
Never: Force-push without explicit request
Always: Verify tests before offering options
Always: Present exactly 4 options
Always: Get typed confirmation for Option 4
Always: Clean up worktree for Options 1 & 4 only

GitHub Stats

Author

@obra

Repository

obra/superpowers

Stars

9,202

Explore More Skills

revenuecat

@rawveg

Comprehensive assistance with RevenueCat in-app subscriptions and purchases

687

7mo ago

finishing-a-development-branch

Explore More Skills

revenuecat

api-design-principles

solana-security