conflict-resolver-specific

conflict-resolver-specific is a command for Claude Code from mort-lab/excel-mcp. It costs 0 tokens per session (269 once invoked), scanned A, a copy of conflict-resolver-specific, MIT.

A command for resolving Git merge conflicts using the requested strategy, such as safer choices, more aggressive choices, or preference for one branch. Git merge conflicts happen when competing changes cannot be combined automatically.

In plain words
What is it for?
Use it when resolving selected merge conflicts, checking related pull requests, documenting decisions, and optionally testing after each resolution.
Why use it?
It helps untangle conflicting edits while considering their purpose, project compatibility, tests, and special files such as dependency locks or database migrations.

Command for Claude Code

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.

agentmods
npx agentmods add commands/mort-lab/excel-mcp/conflict-resolver-specific
Clone the repo
git clone --depth 1 https://github.com/mort-lab/excel-mcp

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

README.md
[![agentmods](https://agentmods.dev/badge/commands/mort-lab/excel-mcp/conflict-resolver-specific.svg)](https://agentmods.dev/commands/mort-lab/excel-mcp/conflict-resolver-specific)
Your own site
<a href="https://agentmods.dev/commands/mort-lab/excel-mcp/conflict-resolver-specific"><img src="https://agentmods.dev/badge/commands/mort-lab/excel-mcp/conflict-resolver-specific.svg" alt="Measured on agentmods" height="20"></a>
Per session 0 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 269 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin 100% copy Near-identical to another mod 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 $0.00000 $0.00269
Opus 5 $0.00000 $0.00134
Sonnet 5 $0.00000 $0.00054
Haiku 4.5 $0.00000 $0.00027

Measured 5d ago against content hash ed078ede8107, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

conflict-resolver-specific 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 5d 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.

Origin

This is a copy

100% identical to conflict-resolver-specific — 56 lines differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.

.claude/commands/git-operations/conflict-resolver-specific.md · 29 lines

What it actually says

You are an expert at resolving Git merge conflicts. $ARGUMENTS

Resolution strategy based on arguments:

  • If "safe" is mentioned: Only auto-resolve obvious conflicts, ask for guidance on complex ones
  • If "aggressive" is mentioned: Make best judgment calls on all conflicts
  • If "test" is mentioned: Run tests after each resolution
  • If "ours" is mentioned: Prefer our changes when in doubt
  • If "theirs" is mentioned: Prefer their changes when in doubt
  • If specific files are mentioned: Only resolve those files

Process:

  1. Check git status and identify conflicts
  2. use the github cli to check the PRs and understand the context
  3. Think hard about your findings and plan accordingly
  4. Based on the strategy arguments provided, resolve conflicts accordingly
  5. For each resolution, document what decision was made and why
  6. If "test" was specified, run tests after each file resolution
  7. Provide detailed summary of all resolutions

Special handling:

  • package-lock.json / yarn.lock: Usually regenerate these files
  • Migration files: Be extra careful, might need to create new migration
  • Schema files: Ensure compatibility is maintained
  • API files: Check for breaking changes

Start by running git status to see all conflicts.

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. 5d ago First seen · 29 lines · 0 tokens per session scan A ed078ede8107

Subscribe to this mod's changes

conflict-resolver-specific is a command published in the GitHub repository mort-lab/excel-mcp (5 stars, last pushed 27d ago), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 269 tokens. A static security scan graded it A with 0 findings. It is 100% identical to conflict-resolver-specific, differing in 56 lines, and is treated as a copy.