merge-worktree-resolve

merge-worktree-resolve is a command for Claude Code from axiomantic/spellbook. It costs 18 tokens per session (276 once invoked), scanned A, original, MIT.

A command for resolving Git merge conflicts while preserving changes from both sides. It uses predefined interface contracts to decide what the combined code must do.

In plain words
What is it for?
Use it when a merge has conflicts in code that must continue to honor agreed type signatures and function contracts.
Why use it?
It prevents conflict resolution from silently discarding one branch or leaving mismatched function signatures and behavior.

Command for Claude Code

Written for Claude Code: a Claude Code command (commands/*.md).

Good fit Use it when a merge has conflicts in code that must continue…

Compare 6 commands from other repositories ↓
Install with agentmods
npx agentmods add commands/axiomantic/spellbook/merge-worktree-resolve
Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Clone the repo
git clone --depth 1 https://github.com/axiomantic/spellbook

Made for: Claude Code.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for merge-worktree-resolve

README.md
[![agentmods](https://agentmods.dev/badge/commands/axiomantic/spellbook/merge-worktree-resolve.svg)](https://agentmods.dev/commands/axiomantic/spellbook/merge-worktree-resolve)
Your own site
<a href="https://agentmods.dev/commands/axiomantic/spellbook/merge-worktree-resolve"><img src="https://agentmods.dev/badge/commands/axiomantic/spellbook/merge-worktree-resolve.svg" alt="Measured on agentmods" height="20"></a>
Per session 18 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 276 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00018 $0.00276
Opus 5 $0.00009 $0.00138
Sonnet 5 $0.00004 $0.00055
Haiku 4.5 $0.00002 $0.00028

Measured 3d ago against content hash 8ed240638a69, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-06, from the pricing page.

Security

Grade A, and why

merge-worktree-resolve scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 3d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

commands/merge-worktree-resolve.md · 36 lines

What it actually says

Phase 3: Conflict Resolution

Invariant Principles

  1. Synthesize both sides, never pick one - Conflict resolution must integrate both changesets; either/or resolution loses work
  2. Interface contracts are the arbiter - When both sides claim different behavior, the implementation plan's interface contract is ground truth
  3. Verify contracts after every resolution - Type signatures and function behavior must match the contract spec before continuing

When merge conflicts occur, delegate to resolving-merge-conflicts skill with interface contract context.

Invoke resolving-merge-conflicts with:

  • Interface contracts (from implementation plan)
  • Worktree purpose (what this worktree implemented)
  • Expected interfaces (type signatures, function contracts)

After resolution - Contract Verification:

Check Action if Failed
Type signatures match contract Fix to match contract spec
Function behavior matches spec Revert to contract-compliant version
Both sides honor interfaces Synthesis is valid

Violation = fix before git merge --continue

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 3d ago First seen · 36 lines · 18 tokens per session scan A 8ed240638a69

Subscribe to this mod's changes

merge-worktree-resolve is a command published in the GitHub repository axiomantic/spellbook (10 stars, last pushed 3d ago), licensed MIT. It adds 18 tokens to every session and 276 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-09-03.