name: finishing-a-development-branch
description: Use when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for merge, PR, or cleanup

Finishing a Development Branch

Overview

Guide completion of development work by presenting clear options and handling chosen workflow.

Core principle: Verify tests → Pre-commit → Present options → Execute choice → Clean up.

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

⚠️ CRITICAL: Rapyuta Best Practices

Conventional Commits (REQUIRED):

Format: <type>(<scope>): <description>

Azure Boards Integration (REQUIRED for PRs):
- Always ask for work item ID before creating PR
- Link format: AB#<id> (e.g., AB#92218)
- Full link in PR body: Completed [AB#92218](https://dev.azure.com/rapyuta-robotics/.../_workitems/edit/92218)

Pre-commit Hooks (REQUIRED):
- Run pre-commit run --all-files before any commit/PR
- Fix all issues before proceeding

The Process

Step 1: Verify Tests and Pre-commit

Before presenting options, verify tests AND pre-commit hooks pass:

# Run project's test suite (use parallel execution for speed)
npm test / cargo test / pytest -n auto / go test ./...

# Run pre-commit hooks (REQUIRED)
pre-commit run --all-files

If tests fail:

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

[Show failures]

Cannot proceed with merge/PR until tests pass.

If pre-commit fails:

Pre-commit hooks failing. Must fix before completing:

[Show failures]

Cannot proceed until pre-commit passes.

Stop. Don't proceed to Step 2.

If both pass: 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

Before creating PR, ask for Azure Boards work item:

Do you have an Azure Boards work item ID for this change?
(e.g., AB#12345 or just the number)

Commit message format (Conventional Commits):

<type>(<scope>): <description>

AB#<work-item-id>

Types: feat, fix, docs, style, refactor, perf, test, chore

Examples:
- feat(api): add user authentication endpoint
- fix(audit): process shortages first during approve
- test(api): add integration tests for orders

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

# Create PR with Azure Boards link
gh pr create --title "<type>(<scope>): <description>" --body "$(cat <<'EOF'
Completed [AB#<work-item-id>](https://dev.azure.com/rapyuta-robotics/f21b62c9-dada-45d1-9333-5000c3141ee8/_workitems/edit/<work-item-id>)

## Summary
<2-3 bullets of what changed>

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

If no work item provided: Use AB#0 as placeholder, but warn user:

⚠️ No work item linked. Using AB#0. Consider creating a work item for tracking.

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
- Proceed with failing pre-commit hooks
- Merge without verifying tests on result
- Delete work without confirmation
- Force-push without explicit request
- Create PR without asking for Azure Boards work item
- Use non-conventional commit messages

Always:
- Run pre-commit hooks before any commit/PR
- Use conventional commit format (type(scope): description)
- Ask for Azure Boards ID before creating PR
- Link work item in PR body with Completed [AB#...](...)
- Verify tests before offering options
- Present exactly 4 options
- Get typed confirmation for Option 4
- Clean up worktree for Options 1 & 4 only

Integration

Called by:
- subagent-driven-development (Step 7) - After all tasks complete
- executing-plans (Step 5) - After all batches complete

Pairs with:
- using-git-worktrees - Cleans up worktree created by that skill