1. Check current branch and parent
2. Fetch origin
3. Merge parent into current branch
   - If conflict → help resolve
   - If clean → continue
4. Run test suite
   - If fail → help fix
   - If pass → continue
5. Report: "Branch ready. Use SPC C x to merge, create PR, or cleanup."

---
name: preparing-branch-for-integration
description: Use when ready to integrate a feature branch - fetches latest, rebases, resolves conflicts, runs tests, then hands off to user for merge/PR decision
---

# Preparing Branch for Integration

## Overview

Get a feature branch ready for integration. You handle the prep, user executes.

**Announce at start:** "I'm preparing this branch for integration."

## The Process

### Step 1: Identify Context

\`\`\`bash
git branch --show-current
git rev-parse --abbrev-ref @{upstream} 2>/dev/null || echo "no upstream"
\`\`\`

Determine parent branch (usually main/master, or from worktree metadata).

### Step 2: Fetch Latest

\`\`\`bash
git fetch origin
\`\`\`

### Step 3: Merge Parent

\`\`\`bash
git merge origin/<parent-branch>
\`\`\`

**If conflicts:**
- Show conflicted files
- Help resolve each one
- Run `git add` after each resolution
- Complete merge with `git commit`

**If clean:** Continue.

### Step 4: Run Tests

\`\`\`bash
# Detect and run appropriate test command
npm test || cargo test || pytest || go test ./...
\`\`\`

**If tests fail:**
- Show failures
- Help fix
- Re-run until green

### Step 5: Hand Off

Report:
\`\`\`
Branch is ready for integration:
- Parent: <parent-branch>
- Commits ahead: <N>
- Tests: passing

Use SPC C x to:
- [m] Merge & cleanup
- [p] Push & create PR
- [k] Keep working
- [d] Discard
\`\`\`

## Do NOT

- Execute merge into parent
- Create PRs
- Delete branches
- Modify Emacs workspaces

The user handles execution via Emacs UI.

# Check if in Claude workspace
REPO=$(basename $(git rev-parse --show-toplevel))
BRANCH=$(git branch --show-current)
if [[ -f "$HOME/worktrees/metadata/$REPO/$BRANCH.json" ]]; then
  echo "Claude workspace detected"
fi