finishing-a-development-branch

Finishing a Development Branch

Announce at start: "I'm using the finishing-a-development-branch skill to complete this work."

Phase 0: Tessera Compliance Gate

If tessera MCP is configured AND a plan was registered with plan_save:

Run the tessera-verify skill BEFORE verifying tests:

1. Run tessera-verify
2. Review compliance report
   - All checklist items done?
   - All target files in git diff?
3. If gaps: complete missing implementation before proceeding

Only after tessera-verify is clean: proceed to Step 1.

Step 1: Verify Tests

# Python: uv run pytest
# Node: npm test
# Go: go test ./...

If tests fail:

Tests failing (<N> failures). Must fix before completing.

Stop. Don't proceed to options.

Step 2: Detect Environment

GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)
GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" 2>/dev/null && pwd -P)

• Normal repo or named-branch worktree: show 4 options
• Detached HEAD worktree: show 3 options (no merge)

Step 3: Determine Base Branch

git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null

Step 4: Present Options

Normal repo / named-branch worktree:

Implementation complete. What would you like to do?

1. Merge back to <base-branch> locally
2. Push and create a Pull Request
3. Keep the branch as-is (I'll handle it later)
4. Discard this work

Which option?

Detached HEAD:

1. Push as new branch and create a Pull Request
2. Keep as-is (I'll handle it later)
3. Discard this work

Step 5: Execute Choice

Option 1 — Merge locally:

MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
cd "$MAIN_ROOT"
git checkout <base-branch> && git pull && git merge <feature-branch>

Run tests on merged result. Only on success: cleanup worktree, delete branch.