finishing-a-development-branch

Finishing a Development Branch

Browser-Based Questions

When a collab session is active, use render_ui for all user interactions.

Component selection:

Example - Yes/No:

Tool: mcp__plugin_mermaid-collab_mermaid__render_ui
Args: {
  "project": "<cwd>",
  "session": "<session>",
  "ui": {
    "type": "Card",
    "props": { "title": "<question context>" },
    "children": [{ "type": "Markdown", "props": { "content": "<question>" } }],
    "actions": [
      { "id": "yes", "label": "Yes", "primary": true },
      { "id": "no", "label": "No" }
    ]
  },
  "blocking": true
}

Terminal prompts only when: No collab session exists (pre-session selection).

Overview

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."

The Process

Step 1: Verify Completion

Before presenting options, verify:

1. Tests pass:

# Run project's test suite
npm test / cargo test / pytest / go test ./...

2. Design alignment (if design artifacts exist):

• Open design doc — does implementation match?
• Open mermaid-collab wireframes/diagrams — does implementation match?
• Any deviations = not complete, go back and fix

If tests fail or design doesn't match:

Cannot proceed. Issues:
- [test failures or design mismatches]

Must fix before completing.

Stop. Don't proceed to Step 2.

If tests pass AND design matches: Continue to Step 2.

Step 2: Determine Base Branch

# Try common base branches
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 exactly these 4 options:

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?

Don't add explanation - keep options concise.

Step 4: Execute Choice

Option 1: Merge Locally

# Switch to base branch
git checkout <base-branch>

# Pull latest
git pull

# Merge feature branch
git merge <feature-branch>

# Verify tests on merged result
<test command>

# If tests pass
git branch -d <feature-branch>

Then: Cleanup worktree (Step 5)

Option 2: Push and Create PR

# Push branch
git push -u origin <feature-branch>

# Create PR
gh pr create --title "<title>" --body "$(cat <<'EOF'
## Summary
<2-3 bullets of what changed>

## Test Plan
- [ ] <verification steps>
EOF
)"

Then: Cleanup worktree (Step 5)

Option 3: Keep As-Is

Report: "Keeping branch . Worktree preserved at ."

Don't cleanup worktree.

Option 4: Discard

Confirm first:

This will permanently delete:
- Branch <name>
- All commits: <commit-list>
- Worktree at <path>

Type 'discard' to confirm.

Wait for exact confirmation.

If confirmed:

git checkout <base-branch>
git branch -D <feature-branch>

Then: Cleanup worktree (Step 5)

Step 5: Cleanup Worktree

For Options 1, 2, 4:

Check if in worktree:

git worktree list | grep $(git branch --show-current)

If yes:

git worktree remove <worktree-path>

For Option 3: Keep worktree.

Quick Reference

Common Mistakes

Skipping test verification

• Problem: Merge broken code, create failing PR
• Fix: Always verify tests before offering options

Open-ended questions

• Problem: "What should I do next?" → ambiguous
• Fix: Present exactly 4 structured options

Automatic worktree cleanup

• Problem: Remove worktree when might need it (Option 2, 3)
• Fix: Only cleanup for Options 1 and 4

No confirmation for discard

• Problem: Accidentally delete work
• Fix: Require typed "discard" confirmation

Red Flags

Never:

• Proceed with failing tests
• Merge without verifying tests on result
• Delete work without confirmation
• Force-push without explicit request

Always:

• Verify tests before offering options
• Present exactly 4 options
• Get typed confirmation for Option 4
• Clean up worktree for Options 1 & 4 only

Collab Session Cleanup

After the development branch work is complete (merged, PR created, or kept):

Development branch work complete.

To close this collab session, run `/collab-cleanup`
- Archive design artifacts to `docs/designs/`
- Or delete the session
- Or keep it for reference

Run cleanup now?

1. Yes
2. No

• If 1 (Yes): Invoke collab-cleanup skill
• If 2 (No): "Session kept open. Run /collab-cleanup when ready."

Integration

Called by:

• mermaid-collab:subagent-driven-development:implementer-prompt (Step 7) - After all tasks complete
• executing-plans (Step 5) - After all batches complete

Transitions to:

• collab-cleanup - After branch work completes (within collab workflow)

Pairs with:

• using-git-worktrees - Cleans up worktree created by that skill