finishing-a-development-branch

原文涵盖的主题

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

Guide completion of development work by presenting clear options and handling chosen workflow. Core principle: Verify tests → Present options → Execute choice → Clean up. Announce at start: "I'm using the finishing-a-development-branch skill to complete this work." Before presenting options, verify tests pass: If tests fail: Stop. Don't proceed to Step 2. If tests pass: Continue to Step 2. Or ask: "This branch split from main - is that correct?" Present exactly these 4 options: Don't add explanation - keep options concise. Then: Cleanup worktree (Step 5) Then: Cleanup worktree (Step 5) Report: "Keeping branch . Worktree preserved at ." Don't cleanup worktree. Confirm first: Wait for exact confirmation. If confirmed: Then: Cleanup worktree (Step 5) For Options 1, 2, 4: Check if in worktree: If yes: For Option 3: Keep worktree. | Option | Merge | Push | Keep Worktree | Cleanup Branch | |--------|-------|------|---------------|----------------| | 1. Merge locally | ✓ | - | - | ✓ | | 2. Create PR | - | ✓ | ✓ | - | | 3. Keep as-is | - | - | ✓ | - | | 4. Discard | - | - | - | ✓ (force) | Skipping test verification Problem: Merge broken code, create failing PR Fix: Always verify tests bef

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