finishing-a-development-branchlisted

# Finishing a Development Branch ## Contents - [Overview](#overview) - [Process](#process) - [Step 1: Test verification](#step-1-test-verification) - [Step 2: Determine the base branch](#step-2-determine-the-base-branch) - [Step 3: Present options](#step-3-present-options) - [Step 4: Execute the selection](#step-4-execute-the-selection) - [Step 5: Worktree cleanup](#step-5-worktree-cleanup) - [Quick reference](#quick-reference) - [Common mistakes](#common-mistakes) - [Red flags](#red-flags) - [Integration](#integration) ## Overview Guide the completion of development work with clear options and handle the selected workflow. Core principle: test verification -> present options -> execute the selection -> cleanup. Announcement at start: "I'm using the finishing-a-development-branch skill to complete this work." ## Process ### Step 1: Test verification Verify that tests pass before presenting options: ```bash # Run the project test suite npm test / cargo test / pytest / go test ./... ``` When tests fail: ``` Tests failing (<N> failures). Must fix before completing: [Show failures] Cannot proceed with merge/PR until tests pass. ``` Stop. Do not proceed to Step 2. When tests pass: proceed to Step 2. ### Step 2: Determine the base branch ```bash # Try the common base branch git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null ``` Or ask: "This branch split from main - is that correct?" ### Step 3: Present options Present exact