Name: spec-kitty.merge
Author: wildcard

Prompt file imported from wildcard/caro (.codex/prompts/spec-kitty.merge.md). Copyright stays with the author.

Path reference rule: When you mention directories or files, provide either the absolute path or a path relative to the project root (for example, kitty-specs/<feature>/tasks/). Never refer to a folder by name alone.

Path: .kittify/templates/commands/merge.md

Merge Feature Branch

This command merges a completed feature branch into the main/target branch and handles cleanup of worktrees and branches.

⛔ Location Pre-flight Check (CRITICAL)

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

Verify your current location:

pwd
git branch --show-current

Expected output:

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

If you see:

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

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

This command merges your feature INTO main. Running from the wrong location can cause:

Loss of work
Merge conflicts
Repository corruption

Correct the issue:

Navigate to your feature worktree: cd .worktrees/001-feature-name
Verify you're on the correct feature branch: git branch --show-current
Then run this merge command again

Prerequisites

Before running this command:

✅ Feature must pass /spec-kitty.accept checks
✅ All work packages must be in tasks/done/
✅ Working directory must be clean (no uncommitted changes)
✅ Run the command from the feature worktree (Spec Kitty will move the merge to the primary repo automatically)

What This Command Does

Detects your current feature branch and worktree status
Verifies working directory is clean
Switches to the target branch (default: main) in the primary repository
Updates the target branch (git pull --ff-only)
Merges the feature using your chosen strategy
Optionally pushes to origin
Removes the feature worktree (if in one)
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

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

Option	Description	Default
`--strategy`	Merge strategy: `merge`, `squash`, or `rebase`	`merge`
`--delete-branch` / `--keep-branch`	Delete feature branch after merge	delete
`--remove-worktree` / `--keep-worktree`	Remove feature worktree after merge	remove
`--push`	Push to origin after merge	no push
`--target`	Target branch to merge into	`main`
`--dry-run`	Show what would be done without executing	off

Worktree Strategy

Spec Kitty uses an opinionated worktree approach:

The Pattern

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

The Rules

Main branch stays in the primary repo root
Feature branches live in .worktrees/<feature-slug>/
Work on features happens in their worktrees (isolation)
Merge from worktrees using this command – the CLI will hop to the primary repo for the Git merge
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

Clean working directory check - Won't merge with uncommitted changes
Primary repo hand-off - Automatically runs Git operations from the main checkout when invoked in a worktree
Fast-forward only pull - Won't proceed if main has diverged
Graceful failure - If merge fails, you can fix manually
Optional operations - Push, branch delete, and worktree removal are configurable
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)
✅ 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 ✅

Install spec-kitty.merge and it becomes one more candidate the router can pick - when it fits.

A listing is a routing target with a manifest: what it does, which domains it covers, what it costs and who publishes it. Once installed it sits beside your own models and tools, is scored like any other candidate for each request, and shows up in the trace when it wins. Ratings come from workspaces that installed it, one per account.

**Path reference rule:** When you mention directories or files, provide either the absolute path or a path relative to the project root (for example, `kitty-specs/<feature>/tasks/`). Never refer to a folder by name alone. *Path: [.kittify/templates/commands/merge.md](.kittify/templates/commands/merge.md)* # Merge Feature Branch This command merges a completed feature branch into the main/target branch and handles cleanup of worktrees and branches. ## ⛔ Location Pre-flight Check (CRITICAL) **BEFORE PROCEEDING:** You MUST be in the feature worktree, NOT the main repository. Verify your current location: ```bash pwd git branch --show-current ``` **Expected output:** - `pwd`: Should end with `.worktrees/001-feature-name` (or similar feature worktree) - Branch: Should show your feature branch name like `001-feature-name` (NOT `main` or `release/*`) **If you see:** - Branch showing `main` or `release/` - OR pwd shows the primary repository checkout root ⛔ **STOP - DANGER! You are in the wrong location!** This command merges your feature INTO main. Running from the wrong location can cause: - Loss of work - Merge conflicts - Repository corruption **Correct the issue:** 1. Navigate to your feature worktree: `cd .worktrees/001-feature-name` 2. Verify you're on the correct feature branch: `git branch --show-current` 3. Then run this merge command again --- ## Prerequisites Before running this command: 1. ✅ Feature must pass `/spec-kitty.accept` checks 2. ✅ All work packages must be in `tasks/done/` 3. ✅ Working directory must be clean (no uncommitted changes) 4. ✅ Run the command from the feature worktree (Spec Kitty will move the merge to the primary repo automatically) ## What This Command Does 1. **Detects** your current feature branch and worktree status 2. **Verifies** working directory is clean 3. **Switches** to the target branch (default: `main`) in the primary repository 4. **Updates** the target branch (`git pull --ff-only`) 5. **Merges** the feature using your chosen strategy 6. **Optionally pushes** to origin 7. **Removes** the feature worktree (if in one) 8. **Deletes** the feature branch ## Usage ### Basic merge (default: merge commit, cleanup everything) ```bash spec-kitty merge ``` This will: - Create a merge commit - Remove the worktree - Delete the feature branch - Keep changes local (no push) ### Merge with options ```bash # 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 ``` ### Common workflows ```bash # 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. ```bash 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. ```bash 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). ```bash spec-kitty merge --strategy rebase ``` ✅ Linear history without merge commits ❌ Requires manual intervention ❌ Rewrites commit history ## Options | Option | Description | Default | |--------|-------------|---------| | `--strategy` | Merge strategy: `merge`, `squash`, or `rebase` | `merge` | | `--delete-branch` / `--keep-branch` | Delete feature branch after merge | delete | | `--remove-worktree` / `--keep-worktree` | Remove feature worktree after merge | remove | | `--push` | Push to origin after merge | no push | | `--target` | Target branch to merge into | `main` | | `--dry-run` | Show what would be done without executing | off | ## Worktree Strategy Spec Kitty uses an **opinionated worktree approach**: ### The Pattern ``` my-project/ # Main repo (main branch) ├── .worktrees/ │ ├── 001-auth-system/ # Feature 1 worktree │ ├── 002-dashboard/ # Feature 2 worktree │ └── 003-notifications/ # Feature 3 worktree ├── .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 – the CLI will hop to the primary repo for the Git merge 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: ```bash cd .worktrees/<feature-slug> # or git checkout <feature-branch> ``` ### "Working directory has uncommitted changes" Commit or stash your changes: ```bash git add . git commit -m "Final changes" # or git stash ``` ### "Could not fast-forward main" Your main branch is behind origin: ```bash git checkout main git pull git checkout <feature-branch> spec-kitty merge ``` ### "Merge failed - conflicts" Resolve conflicts manually: ```bash # 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. **Primary repo hand-off** - Automatically runs Git operations from the main checkout when invoked in a worktree 3. **Fast-forward only pull** - Won't proceed if main has diverged 4. **Graceful failure** - If merge fails, you can fix manually 5. **Optional operations** - Push, branch delete, and worktree removal are configurable 6. **Dry run mode** - Preview exactly what will happen ## Examples ### Complete feature and push ```bash cd .worktrees/001-auth-system /spec-kitty.accept /spec-kitty.merge --push ``` ### Squash merge for cleaner history ```bash spec-kitty merge --strategy squash --push ``` ### Merge but keep branch for reference ```bash spec-kitty merge --keep-branch --push ``` ### Check what will happen first ```bash 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`) - ✅ Ready to start your next feature! ## Integration with Accept The typical flow is: ```bash # 1. Run acceptance checks /spec-kitty.accept --mode local # 2. If checks pass, merge /spec-kitty.merge --push ``` Or combine conceptually: ```bash # 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 ✅ ```

{ "prompt": "**Path reference rule:** When you mention directories or files, provide either the absolute path or a path relative to the project root (for example, `kitty-specs/<feature>/tasks/`). Never refer to a folder by name alone.\n\n*Path: [.kittify/templates/commands/merge.md](.kittify/templates/commands/merge.md)*\n\n\n# Merge Feature Branch\n\nThis command merges a completed feature branch into the main/target branch and handles cleanup of worktrees and branches.\n\n## ⛔ Location Pre-flight Check (CRITICAL)\n\n**BEFORE PROCEEDING:** You MUST be in the feature worktree, NOT the main repository.\n\nVerify your current location:\n```bash\npwd\ngit branch --show-current\n```\n\n**Expected output:**\n- `pwd`: Should end with `.worktrees/001-feature-name` (or similar feature worktree)\n- Branch: Should show your feature branch name like `001-feature-name` (NOT `main` or `release/*`)\n\n**If you see:**\n- Branch showing `main` or `release/`\n- OR pwd shows the primary repository checkout root\n\n⛔ **STOP - DANGER! You are in the wrong location!**\n\nThis command merges your feature INTO main. Running from the wrong location can cause:\n- Loss of work\n- Merge conflicts\n- Repository corruption\n\n**Correct the issue:**\n1. Navigate to your feature worktree: `cd .worktrees/001-feature-name`\n2. Verify you're on the correct feature branch: `git branch --show-current`\n3. Then run this merge command again\n\n---\n\n## Prerequisites\n\nBefore running this command:\n\n1. ✅ Feature must pass `/spec-kitty.accept` checks\n2. ✅ All work packages must be in `tasks/done/`\n3. ✅ Working directory must be clean (no uncommitted changes)\n4. ✅ Run the command from the feature worktree (Spec Kitty will move the merge to the primary repo automatically)\n\n## What This Command Does\n\n1. **Detects** your current feature branch and worktree status\n2. **Verifies** working directory is clean\n3. **Switches** to the target branch (default: `main`) in the primary repository\n4. **Updates** the target branch (`git pull --ff-only`)\n5. **Merges** the feature using your chosen strategy\n6. **Optionally pushes** to origin\n7. **Removes** the feature worktree (if in one)\n8. **Deletes** the feature branch\n\n## Usage\n\n### Basic merge (default: merge commit, cleanup everything)\n\n```bash\nspec-kitty merge\n```\n\nThis will:\n- Create a merge commit\n- Remove the worktree\n- Delete the feature branch\n- Keep changes local (no push)\n\n### Merge with options\n\n```bash\n# Squash all commits into one\nspec-kitty merge --strategy squash\n\n# Push to origin after merging\nspec-kitty merge --push\n\n# Keep the feature branch\nspec-kitty merge --keep-branch\n\n# Keep the worktree\nspec-kitty merge --keep-worktree\n\n# Merge into a different branch\nspec-kitty merge --target develop\n\n# See what would happen without doing it\nspec-kitty merge --dry-run\n```\n\n### Common workflows\n\n```bash\n# Feature complete, squash and push\nspec-kitty merge --strategy squash --push\n\n# Keep branch for reference\nspec-kitty merge --keep-branch\n\n# Merge into develop instead of main\nspec-kitty merge --target develop --push\n```\n\n## Merge Strategies\n\n### `merge` (default)\nCreates a merge commit preserving all feature branch commits.\n```bash\nspec-kitty merge --strategy merge\n```\n✅ Preserves full commit history\n✅ Clear feature boundaries in git log\n❌ More commits in main branch\n\n### `squash`\nSquashes all feature commits into a single commit.\n```bash\nspec-kitty merge --strategy squash\n```\n✅ Clean, linear history on main\n✅ Single commit per feature\n❌ Loses individual commit details\n\n### `rebase`\nRequires manual rebase first (command will guide you).\n```bash\nspec-kitty merge --strategy rebase\n```\n✅ Linear history without merge commits\n❌ Requires manual intervention\n❌ Rewrites commit history\n\n## Options\n\n| Option | Description | Default |\n|--------|-------------|---------|\n| `--strategy` | Merge strategy: `merge`, `squash`, or `rebase` | `merge` |\n| `--delete-branch` / `--keep-branch` | Delete feature branch after merge | delete |\n| `--remove-worktree` / `--keep-worktree` | Remove feature worktree after merge | remove |\n| `--push` | Push to origin after merge | no push |\n| `--target` | Target branch to merge into | `main` |\n| `--dry-run` | Show what would be done without executing | off |\n\n## Worktree Strategy\n\nSpec Kitty uses an **opinionated worktree approach**:\n\n### The Pattern\n```\nmy-project/ # Main repo (main branch)\n├── .worktrees/\n│ ├── 001-auth-system/ # Feature 1 worktree\n│ ├── 002-dashboard/ # Feature 2 worktree\n│ └── 003-notifications/ # Feature 3 worktree\n├── .kittify/\n├── kitty-specs/\n└── ... (main branch files)\n```\n\n### The Rules\n1. **Main branch** stays in the primary repo root\n2. **Feature branches** live in `.worktrees/<feature-slug>/`\n3. **Work on features** happens in their worktrees (isolation)\n4. **Merge from worktrees** using this command – the CLI will hop to the primary repo for the Git merge\n5. **Cleanup is automatic** - worktrees removed after merge\n\n### Why Worktrees?\n- ✅ Work on multiple features simultaneously\n- ✅ Each feature has its own sandbox\n- ✅ No branch switching in main repo\n- ✅ Easy to compare features\n- ✅ Clean separation of concerns\n\n### The Flow\n```\n1. /spec-kitty.specify → Creates branch + worktree\n2. cd .worktrees/<feature>/ → Enter worktree\n3. /spec-kitty.plan → Work in isolation\n4. /spec-kitty.tasks\n5. /spec-kitty.implement\n6. /spec-kitty.review\n7. /spec-kitty.accept\n8. /spec-kitty.merge → Merge + cleanup worktree\n9. Back in main repo! → Ready for next feature\n```\n\n## Error Handling\n\n### \"Already on main branch\"\nYou're not on a feature branch. Switch to your feature branch first:\n```bash\ncd .worktrees/<feature-slug>\n# or\ngit checkout <feature-branch>\n```\n\n### \"Working directory has uncommitted changes\"\nCommit or stash your changes:\n```bash\ngit add .\ngit commit -m \"Final changes\"\n# or\ngit stash\n```\n\n### \"Could not fast-forward main\"\nYour main branch is behind origin:\n```bash\ngit checkout main\ngit pull\ngit checkout <feature-branch>\nspec-kitty merge\n```\n\n### \"Merge failed - conflicts\"\nResolve conflicts manually:\n```bash\n# Fix conflicts in files\ngit add <resolved-files>\ngit commit\n# Then complete cleanup manually:\ngit worktree remove .worktrees/<feature>\ngit branch -d <feature-branch>\n```\n\n## Safety Features\n\n1. **Clean working directory check** - Won't merge with uncommitted changes\n2. **Primary repo hand-off** - Automatically runs Git operations from the main checkout when invoked in a worktree\n3. **Fast-forward only pull** - Won't proceed if main has diverged\n4. **Graceful failure** - If merge fails, you can fix manually\n5. **Optional operations** - Push, branch delete, and worktree removal are configurable\n6. **Dry run mode** - Preview exactly what will happen\n\n## Examples\n\n### Complete feature and push\n```bash\ncd .worktrees/001-auth-system\n/spec-kitty.accept\n/spec-kitty.merge --push\n```\n\n### Squash merge for cleaner history\n```bash\nspec-kitty merge --strategy squash --push\n```\n\n### Merge but keep branch for reference\n```bash\nspec-kitty merge --keep-branch --push\n```\n\n### Check what will happen first\n```bash\nspec-kitty merge --dry-run\n```\n\n## After Merging\n\nAfter a successful merge, you're back on the main branch with:\n- ✅ Feature code integrated\n- ✅ Worktree removed (if it existed)\n- ✅ Feature branch deleted (unless `--keep-branch`)\n- ✅ Ready to start your next feature!\n\n## Integration with Accept\n\nThe typical flow is:\n\n```bash\n# 1. Run acceptance checks\n/spec-kitty.accept --mode local\n\n# 2. If checks pass, merge\n/spec-kitty.merge --push\n```\n\nOr combine conceptually:\n```bash\n# Accept verifies readiness\n/spec-kitty.accept --mode local\n\n# Merge performs integration\n/spec-kitty.merge --strategy squash --push\n```\n\nThe `/spec-kitty.accept` command **verifies** your feature is complete.\nThe `/spec-kitty.merge` command **integrates** your feature into main.\n\nTogether they complete the workflow:\n```\nspecify → plan → tasks → implement → review → accept → merge ✅\n```", "variables": [], "notes": "Merge a completed feature into the main branch and clean up worktree", "metadata": { "source": { "provider": "github-codex-prompts", "repository": "https://github.com/wildcard/caro", "path": ".codex/prompts/spec-kitty.merge.md", "ref": "be07b22b4d39e6243487a973108ccd658f0fbf8a", "url": "https://github.com/wildcard/caro/blob/be07b22b4d39e6243487a973108ccd658f0fbf8a/.codex/prompts/spec-kitty.merge.md", "key": "wildcard/caro/.codex/prompts/spec-kitty.merge.md" } } }

spec-kitty.merge

About

Merge Feature Branch

⛔ Location Pre-flight Check (CRITICAL)

Prerequisites

What This Command Does

Usage

Basic merge (default: merge commit, cleanup everything)

Merge with options

Common workflows

Merge Strategies

`merge` (default)

`squash`

`rebase`

Options

Worktree Strategy

The Pattern

The Rules

Why Worktrees?

The Flow

Error Handling

"Already on main branch"

"Working directory has uncommitted changes"

"Could not fast-forward main"

"Merge failed - conflicts"

Safety Features

Examples

Complete feature and push

Squash merge for cleaner history

Merge but keep branch for reference

Check what will happen first

After Merging

Integration with Accept

Install spec-kitty.merge and it becomes one more candidate the router can pick - when it fits.

Use it

Manifest

Reviews

About

Merge Feature Branch

⛔ Location Pre-flight Check (CRITICAL)

Prerequisites

What This Command Does

Usage

Basic merge (default: merge commit, cleanup everything)

Merge with options

Common workflows

Merge Strategies

merge (default)

squash

rebase

Options

Worktree Strategy

The Pattern

The Rules

Why Worktrees?

The Flow

Error Handling

"Already on main branch"

"Working directory has uncommitted changes"

"Could not fast-forward main"

"Merge failed - conflicts"

Safety Features

Examples

Complete feature and push

Squash merge for cleaner history

Merge but keep branch for reference

Check what will happen first

After Merging

Integration with Accept

Install spec-kitty.merge and it becomes one more candidate the router can pick - when it fits.

Use it

Manifest

Reviews

`merge` (default)

`squash`

`rebase`