Spec Kitty Merge

Merge a completed feature into the target branch and clean up worktree

richfrem 87a3aa7 20 files · 89.0 KB Updated

File contents

/spec-kitty.merge - Deterministic Merge

Run merge from the primary repository checkout root (outside .worktrees/). The checkout branch can be whatever branch the developer is using.

Required Execution Sequence

  1. Generate deterministic merge plan first:
spec-kitty merge --feature <feature-slug> --dry-run --json
  1. Confirm effective merge tips from JSON (effective_wp_branches).

  2. Execute the actual merge once:

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

Prohibited Behavior

  • Never run manual git merge <feature-WP##> loops by default.
  • Never merge WP01→WP02→... just by numbering.
  • Only attempt manual git merges if spec-kitty merge fails and the user asks for manual recovery.

Interpretation Rules

  • Single effective tip: merge that tip only.
  • Empty effective set: already integrated; no merge needed.
  • all_wp_branches may be larger than effective_wp_branches; this is expected.

richfrem/project_sanctuary/tree/main/.agents/skills/spec-kitty-merge commit 87a3aa7cc8

Frequently asked questions

npx skillmds@latest add richfrem/spec-kitty-merge