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:**
| Question Type | Component |
|--------------|-----------|
| Yes/No | Card with action buttons |
| Choose 1 of 2-5 | RadioGroup |
| Choose 1 of 6+ | MultipleChoice |
| Free text | TextInput or TextArea |

**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:**
```bash
# 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

```bash
# Try common base branches
git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null
```

Or ask: "This bra