Borrowing it
Nothing to install: this file belongs to EchoingVesper/mcp-task-orchestrator. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.
curl -O https://raw.githubusercontent.com/EchoingVesper/mcp-task-orchestrator/main/.claude/commands/git-operations/conflict-resolver-specific.mdgit clone --depth 1 https://github.com/EchoingVesper/mcp-task-orchestratorWrote 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.
[](https://agentmods.dev/commands/echoingvesper/mcp-task-orchestrator/conflict-resolver-specific)<a href="https://agentmods.dev/commands/echoingvesper/mcp-task-orchestrator/conflict-resolver-specific"><img src="https://agentmods.dev/badge/commands/echoingvesper/mcp-task-orchestrator/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.
<a href="https://agentmods.dev/commands/echoingvesper/mcp-task-orchestrator/conflict-resolver-specific"><img src="https://agentmods.dev/badge/commands/echoingvesper/mcp-task-orchestrator/conflict-resolver-specific.svg" alt="Reviewed on agentmods" width="80" height="20"></a>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.00000 | $0.00269 |
| Opus 5.5 | $0.00000 | $0.00108 |
| Sonnet 5.5 | $0.00000 | $0.00054 |
| Haiku 4.5 | $0.00000 | $0.00027 |
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 2mo 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.
Copies of this mod
1 near-identical copy found in the catalogue:
- conflict-resolver-specific — 100% identical, 56 lines differ
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:
- Check git status and identify conflicts
- use the github cli to check the PRs and understand the context
- Think hard about your findings and plan accordingly
- Based on the strategy arguments provided, resolve conflicts accordingly
- For each resolution, document what decision was made and why
- If "test" was specified, run tests after each file resolution
- 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.
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.
- 2mo ago First seen · 29 lines · 0 tokens per session scan A 6c66badf3ff9
conflict-resolver-specific is a command published in the GitHub repository EchoingVesper/mcp-task-orchestrator (28 stars, last pushed 1y 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. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.
Other commands, from other repositories
auto-claude
Invoke Auto-Claude autonomous coding framework for complex feature implementation.
git-ops
Git + worktree orchestrator entry point. /git-ops --landall surveys every branch/worktree and batch-lands the ones that are done; bare /git-ops runs a status survey. Thin router over the git-ops skill.
fix-issue
Analyze and fix the GitHub issue: $ARGUMENTS.
branch
Show Claude Code costs per git branch / PR.
merge
You are executing the /hydra:merge command. Merge a worktree branch back into the current branch.
sandbox-promote
Promote an accepted, version-worthy WIP artifact from .credo/sandbox-tmp/ / to .credo/sandbox/ /. is the sandbox-tmp folder name (argument: $1).