merge-conflict

merge-conflict is a command for Claude Code from specstoryai/getspecstory. It costs 4 tokens per session (153 once invoked), scanned A, original, Apache-2.0.

A guided command for examining conflicts that happen when Git combines changes from different branches.

In plain words
What is it for?
Use it to inspect the current Git status and diff, review conflicts one by one, and discuss suggested fixes with file and line references.
Why use it?
It explains what each side changed and why, so you can agree on the right resolution before files are modified.

Command for Claude Code

Written for Claude Code: allowed-tools in frontmatter.

Good fit Use it to inspect the current Git status and diff, review conflicts one by one, and discuss suggested fixes with file and line references.

Compare 6 commands from other repositories ↓
Install with agentmods
npx agentmods add commands/specstoryai/getspecstory/merge-conflict
About the project

SpecStory is a local-first tool that records and indexes conversations with AI coding assistants so developers can search, reuse, and share their solutions. It is for preserving coding decisions, snippets, and other knowledge across projects and development tools. Its catalogue skills and commands process saved sessions into reusable agent skills and connect the workflow to coding agents.

specstoryai/getspecstory · 1,328 stars · on GitHub · specstory.com

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/specstoryai/getspecstory

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-conflict

README.md
[![agentmods](https://agentmods.dev/badge/commands/specstoryai/getspecstory/merge-conflict/github.svg)](https://agentmods.dev/commands/specstoryai/getspecstory/merge-conflict)
Your own site
<a href="https://agentmods.dev/commands/specstoryai/getspecstory/merge-conflict"><img src="https://agentmods.dev/badge/commands/specstoryai/getspecstory/merge-conflict/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for merge-conflict

Your own site · 80×15
<a href="https://agentmods.dev/commands/specstoryai/getspecstory/merge-conflict"><img src="https://agentmods.dev/badge/commands/specstoryai/getspecstory/merge-conflict.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 4 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 153 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.00004 $0.00153
Opus 5 $0.00002 $0.00077
Sonnet 5 $0.00001 $0.00031
Haiku 4.5 $0.00000 $0.00015

Measured 11d ago against content hash 4ce6f140a906, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-11, from the pricing page.

Security

Grade A, and why

merge-conflict 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 11d 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.

specstory-cli/.claude/commands/merge-conflict.md · 20 lines

What it actually says

Context

  • Current git status: !git status
  • Current git diff: !git diff

Your task

Examine the current merge conflict using git commands.

Review each issue conflict by conflict and explain what caused each conflict. Explain what each side of the conflict was attempting to accomplish with their change.

Importantly, make a suggestion for the best resolution for each conflict, but only resolve them in discussion with me.

Use file names and line numbers to reference the changes, but also sequentially number every observation so we can easily reference them.

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. 11d ago First seen · 20 lines · 4 tokens per session scan A 4ce6f140a906

Subscribe to this mod's changes

merge-conflict is a command published in the GitHub repository specstoryai/getspecstory (1,328 stars, last pushed 2d ago), licensed Apache-2.0. It adds 4 tokens to every session and 153 once invoked, about $0.0000 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-08-30.