What is resolve-merge?

A procedure for resolving Git merge and rebase conflicts, including conflicts between numbered project documents.

Use it to inspect conflicts, compare both sides, safely renumber colliding files, and apply approved resolutions.

It reduces accidental overwrites by separating mechanical fixes from choices that require human approval.

resolve-merge — Skill for Claude Code by reidemeister94

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.

Any agent

npx skills add reidemeister94/development-skills --skill resolve-merge

Clone the repo

git clone --depth 1 https://github.com/reidemeister94/development-skills

Made for: Claude Code.

Or install development-skills, the plugin that ships this one along with the rest of its 16 skills, 1 agent, 2 hooks.

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.

README.md

[![agentmods](https://agentmods.dev/badge/skills/reidemeister94/development-skills/resolve-merge/github.svg)](https://agentmods.dev/skills/reidemeister94/development-skills/resolve-merge)

Your own site

<a href="https://agentmods.dev/skills/reidemeister94/development-skills/resolve-merge"><img src="https://agentmods.dev/badge/skills/reidemeister94/development-skills/resolve-merge/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.

Your own site · 80×15

<a href="https://agentmods.dev/skills/reidemeister94/development-skills/resolve-merge"><img src="https://agentmods.dev/badge/skills/reidemeister94/development-skills/resolve-merge.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

Per session 25 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.

When invoked 443 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.

Model	Per session	Once invoked
Fable 5.1	$0.00025	$0.00443
Opus 5	$0.00013	$0.00221
Sonnet 5	$0.00005	$0.00089
Haiku 4.5	$0.00003	$0.00044

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

Security

Grade A, and why

resolve-merge 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 12d 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.

skills/resolve-merge/SKILL.md · 26 lines

What it actually says

Resolve Merge Conflicts

Verify MERGE_HEAD or REBASE_HEAD; otherwise stop with No merge in progress.
Before any write, list conflicts and classify each as AUTO or JUDGMENT.
AUTO requires mechanical proof; default to JUDGMENT. AUTO cases:
- Sides byte-identical (git show :2:<f> vs :3:<f>) or differing only in whitespace/EOL → take either.
- AU → git add, but git rm if its slug already exists in theirs at another number (duplicate).
- Lock file → checkout one side, regenerate via the package manager.
- CHANGELOG.md → merge unique entries, dedupe, keep category order.
For numbered plans/chronicles, keep THEIRS numbers. Renumber colliding OURS-only files from the next free number without gaps or duplicates; fix self, research, and cross-references.
Show every conflict with file, code, action, and classification. Ask once: Approve / Modify / Abort. Abort writes nothing.
Apply approved AUTO actions; report only counts and failures.
For each JUDGMENT file, show exact OURS and THEIRS hunks plus the proposed merge. Ask Approve / Edit / Skip; Skip leaves it conflicted.
A file failure stays conflicted and goes under Skipped; continue with others.
Verify no tracked conflict markers, valid numbering and references when relevant, and known build/lint checks.
Report N resolved: X AUTO, Y JUDGMENT; Skipped: …, then hand off to /commit without committing. Stop on failed checks.

On Codex, translate gates with codex-tools.md.

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.

12d ago First seen · 26 lines · 25 tokens per session scan A 770de497f7bc

Subscribe to this mod's changes

resolve-merge is a skill published in the GitHub repository reidemeister94/development-skills (11 stars, last pushed 1mo ago), licensed MIT. It adds 25 tokens to every session and 443 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-08-30.

Claude Code Git and workflow ai-coding claude claude-code-plugin code-quality

review

Structured code review with parallel audit agents, confidence-scored triage, and optional auto-fix. Examines uncommitted changes, staged diffs, commit ranges, or specific paths. Produces a tiered report (MUST-FIX / RECOMMENDED / NIT) backed by evidence, then optionally applies fixes with verification.

greglas75/zuvo · 70 tokens

incident

Incident response and postmortem generation from git/deploy context. When something breaks in production, this skill builds a timeline, identifies the probable cause, and generates a structured postmortem document. Flags: --since, --service, --sev, --revert, --comms, --dry-run.

greglas75/zuvo · 64 tokens

worktree

Isolate work in a git worktree. Activates when the user needs branch isolation before executing a plan, wants a clean environment for a feature, is ready to finish work in an existing worktree, or wants to reclaim worktrees that accumulated and are now polluting filesystem-level measurement.

greglas75/zuvo · 61 tokens

refactor-radar

Select refactor candidates with immutable git measurements, evidence-backed module families and temporary collision checks. Use for ranked refactor/test-debt triage, not implementation. DISCOVER saves reports without changing product code; REGISTER requires validated decisions. Worktree names are hints, test LOC is…

greglas75/zuvo · 71 tokens

release-docs

Diff-driven documentation sync after a release. Determines what source files changed, delegates changelog to zuvo:docs, updates only docs whose source changed. Flags: --dry-run, explicit range argument.

greglas75/zuvo · 44 tokens

canary

Post-deploy monitoring with browser or degraded HTTP mode. Checks console errors, performance, page load. Configurable duration (1m-30m) and interval. Reports HEALTHY/DEGRADED/BROKEN. Flags: --duration, --interval, --quick, --max-errors.

greglas75/zuvo · 63 tokens