Spec Kitty Merge

/spec-kitty.merge - Merge Feature to Main

Version: 0.11.0+ Purpose: Merge ALL completed work packages for a feature into main branch.

CRITICAL: Workspace-per-WP Model (0.11.0)

In 0.11.0, each work package has its own worktree:

• .worktrees/###-feature-WP01/
• .worktrees/###-feature-WP02/
• .worktrees/###-feature-WP03/

Merge merges ALL WP branches at once (not incrementally one-by-one).

⛔ Location Pre-flight Check (CRITICAL)

BEFORE PROCEEDING: You MUST be in a feature worktree, NOT the main repository.

Verify your current location:

pwd
git branch --show-current

Expected output:

• pwd: Should end with .worktrees/###-feature-name-WP01 (or similar feature worktree)
• Branch: Should show your feature branch name like ###-feature-name-WP01 (NOT main or release/*)

If you see:

• Branch showing main or release/
• OR pwd shows the main repository root

⛔ STOP - DANGER! You are in the wrong location!

Correct the issue:

1. Navigate to ANY worktree for this feature: cd .worktrees/###-feature-name-WP01
2. Verify you're on a feature branch: git branch --show-current
3. Then run this merge command again

Exception (main branch): If you are on main and need to merge a workspace-per-WP feature, run:

spec-kitty merge --feature <feature-slug>

Location Pre-flight Check (CRITICAL for AI Agents)

Before merging, verify you are in the correct working directory by running this validation:

python3 -c "
from specify_cli.guards import validate_worktree_location
result = validate_worktree_location()
if not result.is_valid:
    print(result.format_error())
    print('\nThis command MUST run from a feature worktree, not the main repository.')
    print('\nFor workspace-per-WP features, run from ANY WP worktree:')
    print('  cd /path/to/project/.worktrees/<feature>-WP01')
    print('  # or any other WP worktree for this feature')
    raise SystemExit(1)
else:
    print('✓ Location verified:', result.branch_name)
"

What this validates:

• Current branch follows the feature pattern like 001-feature-name or 001-feature-name-WP01
• You're not attempting to run from main or any release branch
• The validator prints clear navigation instructions if you're outside the feature worktree

For workspace-per-WP features (0.11.0+):

• Run merge from ANY WP worktree (e.g., .worktrees/014-feature-WP09/)
• The merge command automatically detects all WP branches and merges them sequentially
• You do NOT need to run merge from each WP worktree individually

Prerequisites

Before running this command:

1. ✅ All work packages must be in done lane (reviewed and approved)
2. ✅ Feature must pass /spec-kitty.accept checks
3. ✅ Working directory must be clean (no uncommitted changes in main)
4. ✅ You must be in main repository root (not in a worktree)

Command Syntax

spec-kitty merge ###-feature-slug [OPTIONS]

Example:

cd /tmp/spec-kitty-test/test-project  # Main repo root
spec-kitty merge 001-cli-hello-world

What This Command Does

1. Detects your current feature branch and worktree status
2. Runs pre-flight validation across all worktrees and the target branch
3. Determines merge order based on WP dependencies (workspace-per-WP)
4. Forecasts conflicts during --dry-run and flags auto-resolvable status files
5. Verifies working directory is clean (legacy single-worktree)
6. Switches to the target branch (default: main)
7. Updates the target branch (git pull --ff-only)
8. Merges the feature using your chosen strategy
9. Auto-resolves status file conflicts after each WP merge
10. Optionally pushes to origin
11. Removes the feature worktree (if in one)
12. Deletes the feature branch

Usage

Basic merge (default: merge commit, cleanup everything)

spec-kitty merge

This will:

• Create a merge commit
• Remove the worktree
• Delete the feature branch
• Keep changes local (no push)

Merge with options

# Squash all commits into one
spec-kitty merge --strategy squash

# Push to origin after merging
spec-kitty merge --push

# Keep the feature branch
spec-kitty merge --keep-branch

# Keep the worktree
spec-kitty merge --keep-worktree

# Merge into a different branch
spec-kitty merge --target develop

# See what would happen without doing it
spec-kitty merge --dry-run

# Run merge from main for a workspace-per-WP feature
spec-kitty merge --feature 017-feature-slug

Common workflows

# Feature complete, squash and push
spec-kitty merge --strategy squash --push

# Keep branch for reference
spec-kitty merge --keep-branch

# Merge into develop instead of main
spec-kitty merge --target develop --push

Merge Strategies

merge (default)

Creates a merge commit preserving all feature branch commits.

spec-kitty merge --strategy merge

✅ Preserves full commit history ✅ Clear feature boundaries in git log ❌ More commits in main branch

squash

Squashes all feature commits into a single commit.

spec-kitty merge --strategy squash

✅ Clean, linear history on main ✅ Single commit per feature ❌ Loses individual commit details

rebase

Requires manual rebase first (command will guide you).

spec-kitty merge --strategy rebase

✅ Linear history without merge commits ❌ Requires manual intervention ❌ Rewrites commit history

Options

Worktree Strategy

Spec Kitty uses an opinionated worktree approach:

Workspace-per-WP Model (0.11.0+)

In the current model, each work package gets its own worktree:

my-project/                              # Main repo (main branch)
├── .worktrees/
│   ├── 001-auth-system-WP01/           # WP01 worktree
│   ├── 001-auth-system-WP02/           # WP02 worktree
│   ├── 001-auth-system-WP03/           # WP03 worktree
│   └── 002-dashboard-WP01/             # Different feature
├── .kittify/
├── kitty-specs/
└── ... (main branch files)

Merge behavior for workspace-per-WP:

• Run spec-kitty merge from any WP worktree for the feature
• The command automatically detects all WP branches (WP01, WP02, WP03, etc.)
• Merges each WP branch into main in sequence
• Cleans up all WP worktrees and branches

Legacy Pattern (0.10.x)

my-project/                    # Main repo (main branch)
├── .worktrees/
│   ├── 001-auth-system/      # Feature 1 worktree (single)
│   ├── 002-dashboard/        # Feature 2 worktree (single)
│   └── 003-notifications/    # Feature 3 worktree (single)
├── .kittify/
├── kitty-specs/
└── ... (main branch files)

The Rules

1. Main branch stays in the primary repo root
2. Feature branches live in .worktrees/<feature-slug>/
3. Work on features happens in their worktrees (isolation)
4. Merge from worktrees using this command
5. Cleanup is automatic - worktrees removed after merge

Why Worktrees?

• ✅ Work on multiple features simultaneously
• ✅ Each feature has its own sandbox
• ✅ No branch switching in main repo
• ✅ Easy to compare features
• ✅ Clean separation of concerns

The Flow

1. /spec-kitty.specify           → Creates branch + worktree
2. cd .worktrees/<feature>/      → Enter worktree
3. /spec-kitty.plan              → Work in isolation
4. /spec-kitty.tasks
5. /spec-kitty.implement
6. /spec-kitty.review
7. /spec-kitty.accept
8. /spec-kitty.merge             → Merge + cleanup worktree
9. Back in main repo!            → Ready for next feature

Error Handling

"Already on main branch"

You're not on a feature branch. Switch to your feature branch first:

cd .worktrees/<feature-slug>
# or
git checkout <feature-branch>

"Working directory has uncommitted changes"

Commit or stash your changes:

git add .
git commit -m "Final changes"
# or
git stash

"Could not fast-forward main"

Your main branch is behind origin:

git checkout main
git pull
git checkout <feature-branch>
spec-kitty merge

"Merge failed - conflicts"

Resolve conflicts manually:

# Fix conflicts in files
git add <resolved-files>
git commit
# Then complete cleanup manually:
git worktree remove .worktrees/<feature>
git branch -d <feature-branch>

Safety Features

1. Clean working directory check - Won't merge with uncommitted changes
2. Fast-forward only pull - Won't proceed if main has diverged
3. Graceful failure - If merge fails, you can fix manually
4. Optional operations - Push, branch delete, and worktree removal are configurable
5. Dry run mode - Preview exactly what will happen

Examples

Complete feature and push

cd .worktrees/001-auth-system
/spec-kitty.accept
/spec-kitty.merge --push

Squash merge for cleaner history

spec-kitty merge --strategy squash --push

Merge but keep branch for reference

spec-kitty merge --keep-branch --push

Check what will happen first

spec-kitty merge --dry-run

After Merging

After a successful merge, you're back on the main branch with:

• ✅ Feature code integrated
• ✅ Worktree removed (if it existed)
• ✅ Feature branch deleted (unless --keep-branch)
• ✅ Workspace tracking files removed (rm -f .kittify/workspaces/<feature-slug>-WP*.json)
• ✅ Ready to start your next feature!

Integration with Accept

The typical flow is:

# 1. Run acceptance checks
/spec-kitty.accept --mode local

# 2. If checks pass, merge
/spec-kitty.merge --push

Or combine conceptually:

# Accept verifies readiness
/spec-kitty.accept --mode local

# Merge performs integration
/spec-kitty.merge --strategy squash --push

The /spec-kitty.accept command verifies your feature is complete. The /spec-kitty.merge command integrates your feature into main.

Together they complete the workflow:

specify → plan → tasks → implement → review → accept → merge ✅