What is merge-resolve?

A workflow for resolving Git merge conflicts, which happen when different changes affect the same lines of a file.

Use it to process selected files or the working tree and resolve conflicts using OpenSpec context bundles.

It uses the surrounding project requirements and change history to choose a resolution, while leaving uncertain conflicts marked for review.

merge-resolve — Skill for Claude Code by fjpulidop

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 fjpulidop/specrails-core --skill merge-resolve

Clone the repo

git clone --depth 1 https://github.com/fjpulidop/specrails-core

Made for: Claude Code.

Or install specrails, the plugin that ships this one along with the rest of its 28 skills, 14 agents.

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/fjpulidop/specrails-core/merge-resolve/github.svg)](https://agentmods.dev/skills/fjpulidop/specrails-core/merge-resolve)

Your own site

<a href="https://agentmods.dev/skills/fjpulidop/specrails-core/merge-resolve"><img src="https://agentmods.dev/badge/skills/fjpulidop/specrails-core/merge-resolve/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/fjpulidop/specrails-core/merge-resolve"><img src="https://agentmods.dev/badge/skills/fjpulidop/specrails-core/merge-resolve.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

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

When invoked 1,388 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.00019	$0.01388
Opus 5	$0.00010	$0.00694
Sonnet 5	$0.00004	$0.00278
Haiku 4.5	$0.00002	$0.00139

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

Security

Grade A, and why

merge-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 9d 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.

specrails-plugin/skills/merge-resolve/SKILL.md · 183 lines

How it starts

The opening of the file, as written. The whole thing — 183 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Smart Merge Conflict Resolver

Resolves git conflict markers in working tree files using AI-powered context analysis. For each conflict block, reads OpenSpec context bundles from the features that produced the conflict, infers the correct resolution, and writes it in place — or preserves clean markers for conflicts it cannot safely resolve.

IMPORTANT: Always follow this procedure exactly as written. Launch the sr-merge-resolver agent as specified. Do NOT attempt to resolve conflicts yourself in the main conversation.

Input: $ARGUMENTS — flags controlling which files to process, where to find context, and resolution behavior.

Step 1: Parse flags

Scan $ARGUMENTS for the following flags:

`--files <paths>`

Type: space-separated file paths or glob patterns Default: auto-detect (scan working tree)

Explicit list of files to process. If a path contains * or ?, treat it as a glob and expand it. Strip this flag and its value from $ARGUMENTS before further processing.

`--context <directory>`

Type: directory path Default: openspec/changes/

Directory to scan for context bundles. The command globs <directory>/*/context-bundle.md. Strip this flag and its value from $ARGUMENTS before further processing.

`--threshold N`

Type: integer 0–100 Default: 70

Minimum confidence score for the resolver to apply an AI resolution. Below this threshold, the resolver preserves conflict markers in normalized format. Strip this flag and its value from $ARGUMENTS before further processing.

`--mode auto|manual-fallback-only`

Type: enum Default: auto

auto: attempt AI resolution for each conflict block
manual-fallback-only: only normalize conflict marker format; do not attempt AI resolution

Strip this flag and its value from $ARGUMENTS before further processing.

After parsing, if any unrecognized flags remain in $ARGUMENTS: print a warning:

[merge-resolve] Warning: unrecognized flags ignored: <remaining>

Read the full file on GitHub · 183 lines

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.

9d ago First seen · 183 lines · 19 tokens per session scan A 1e0334ce6e75

Subscribe to this mod's changes

merge-resolve is a skill published in the GitHub repository fjpulidop/specrails-core (9 stars, last pushed yesterday), licensed MIT. It adds 19 tokens to every session and 1,388 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-31.

Claude Code Code Generation Git and workflow ai-agents anthropic claude developer-tools

taiyi-integration

A project workflow skill for closing a TaiyiForge change and recording it in a CHANGELOG.md file. It checks review results, tests, and the state of the working tree before archiving the change.

Dong90/oh-my-taiyiforge · 27 tokens

security-pipeline

Use when security verification is needed - pre-commit security checks, vulnerability scanning, STRIDE threat analysis. Integrates with /handoff-verify --security and /commit-push-pr. CWE Top 25 based.

sangrokjung/claude-forge · 48 tokens

memstack-security-git-guard

Use when the user says 'git-guard', 'check git protection', 'is this repo protected', 'verify gitleaks', 'set up git hooks', 'install git-guard', or wants to confirm a repo blocks secrets and internal files before commit. This is an installer and verifier, NOT a scanner (gitleaks does the actual scanning). Do NOT use…

cwinvestments/memstack · 92 tokens

merge-resolve