productive-mcp: Command for Claude Code

.claude/commands/git-operations/conflict-resolver-specific.md

conflict-resolver-specific is a command for Claude Code from rubenlangeweg/productive-mcp. It costs 0 tokens per session (269 once invoked), scanned A, original, from a forked repository, no licence file.

A coding-agent command for resolving Git merge conflicts, which happen when separate changes cannot be combined automatically.

In plain words
What is it for?
It helps analyze and resolve merge conflicts. The description does not provide further details about its procedure.
Why use it?
It focuses the agent on handling conflicting edits instead of leaving the developer to reconcile them manually.

Command for Claude Code

Written for Claude Code: installed under .claude/.

This is rubenlangeweg/productive-mcp's own configuration. It tells Claude Code how to work on productive-mcp itself, so it is not a mod to install elsewhere. Copy it as a starting point and replace the rules that are about this project. Everything productive-mcp configures →

Reuse

Borrowing it

Nothing to install: this file belongs to rubenlangeweg/productive-mcp. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.

Copy the file
curl -O https://raw.githubusercontent.com/rubenlangeweg/productive-mcp/main/.claude/commands/git-operations/conflict-resolver-specific.md
Clone the repo
git clone --depth 1 https://github.com/rubenlangeweg/productive-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/rubenlangeweg/productive-mcp/conflict-resolver-specific/github.svg)](https://agentmods.dev/commands/rubenlangeweg/productive-mcp/conflict-resolver-specific)
Your own site
<a href="https://agentmods.dev/commands/rubenlangeweg/productive-mcp/conflict-resolver-specific"><img src="https://agentmods.dev/badge/commands/rubenlangeweg/productive-mcp/conflict-resolver-specific/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 conflict-resolver-specific

Your own site · 80×15
<a href="https://agentmods.dev/commands/rubenlangeweg/productive-mcp/conflict-resolver-specific"><img src="https://agentmods.dev/badge/commands/rubenlangeweg/productive-mcp/conflict-resolver-specific.svg" alt="Reviewed on agentmods" width="80" 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. A grade says what 26 rules found in the file — not that it is safe.
Origin fork From a forked repository.
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.00000 $0.00269
Opus 5 $0.00000 $0.00134
Sonnet 5 $0.00000 $0.00054
Haiku 4.5 $0.00000 $0.00027

Measured 8d ago against content hash ed078ede8107, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-09, 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 8d 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.

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

The source is not reproduced here

No licence file

A repository with no LICENSE is all rights reserved by default, so the body is not copied here. The metadata, the measurements and the link are.

Read it on GitHub

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. 8d 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 rubenlangeweg/productive-mcp (0 stars, last pushed 3mo ago), with no licence file. 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 comes from a forked repository.