finishing-a-development-branch

原文涵盖的主题

• Finishing a Development Branch
• Overview
• Step 1: Verify Tests
• Step 2: Detect Environment
• Step 3: Determine Base Branch
• Step 4: Present Options
• Step 5: Execute Choice
• Option 1: Merge Locally

Core principle: Verify tests → Detect environment → Present options → Execute choice → Clean up. Announce at start: "I'm using the finishing-a-development-branch skill to complete this work." Run the project's full test suite (npm test / cargo test / pytest / go test ./...). If tests fail, report the failures and stop — the menu comes after a green suite: If tests pass: continue to Step 2. This determines which menu to show and how cleanup works: | State | Menu | Cleanup | |-------|------|---------| | GITDIR == GITCOMMON (normal repo) | Standard 3 options | No worktree to clean up | | GITDIR != GITCOMMON, named branch | Standard 3 options | Provenance-based (see Step 6) | | GITDIR != GITCOMMON, detached HEAD | Reduced 2 options (no merge) | Externally managed — leave in place | The base branch is whatever this work forked from — usually named in the plan, the conversation, or the branch's upstream. If it is not already known, ask: "This branch split from - is that correct?" Confirm before merging: merging into the wrong base is expensive to undo. Normal repo and named-branch worktree — present exactly these 3 options: Detached HEAD — present exactly these 2 options: Present the men

这里只展示节选，请以完整原文和当前要求为准。