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.
git clone --depth 1 https://github.com/smrafiz/claude-superchargerWrote 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/smrafiz/claude-supercharger/resolve-conflicts)<a href="https://agentmods.dev/commands/smrafiz/claude-supercharger/resolve-conflicts"><img src="https://agentmods.dev/badge/commands/smrafiz/claude-supercharger/resolve-conflicts/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/smrafiz/claude-supercharger/resolve-conflicts"><img src="https://agentmods.dev/badge/commands/smrafiz/claude-supercharger/resolve-conflicts.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.00522 |
| Opus 5 | $0.00000 | $0.00261 |
| Sonnet 5 | $0.00000 | $0.00104 |
| Haiku 4.5 | $0.00000 | $0.00052 |
Grade A, and why
resolve-conflicts 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.
What it actually says
Resolve an in-progress merge or rebase conflict. Context: $ARGUMENTS
Step 1 — See the actual state
Run git status and git diff --name-only --diff-filter=U for the conflicted files.
Identify whether this is a merge, a rebase, or a cherry-pick — the finish step differs.
Step 2 — Recover the intent behind each side
For every conflicted file, find out why each side changed. git log --merge -p <file>
shows the commits that touched it on both branches; read their messages, and the PR or
issue if the message points at one.
Resolving without this is guessing. A conflict is two intentions colliding, and you cannot preserve an intention you never read.
Step 3 — Resolve each hunk
- Preserve both intents wherever they compose.
- Where they genuinely conflict, keep the one matching the stated goal of this merge and say which trade-off you made and why.
- Do not invent behaviour that was on neither side. A conflict is not a licence to redesign — that change belongs in its own commit where it can be reviewed.
- Never
git merge --abortto escape a hard conflict unless the user asks. Aborting discards the resolution work and the next attempt starts from the same place. - Delete every marker. Grep for
<<<<<<<,=======,>>>>>>>before continuing — a committed marker is a broken build that git will not warn you about.
Step 4 — Verify against the project's own checks
Discover them rather than assuming: look at package.json scripts, Makefile,
.github/workflows/, justfile. Run typecheck, then tests, then formatter — in that
order, since a type error makes test failures unreadable.
A conflict resolution that compiles is not correct. It is the minimum bar for finding out whether it is correct.
Step 5 — Finish
Stage the resolved files and complete the operation: git commit for a merge,
git rebase --continue for a rebase (repeating until every commit is replayed),
git cherry-pick --continue for a cherry-pick.
Step 6 — Report State which files conflicted, what you kept from each side, and every trade-off made. If any resolution was a judgement call rather than a clear merge, say so explicitly — that is the part the user needs to check.
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 · 43 lines · 0 tokens per session scan A 0b8aac27bed2
resolve-conflicts is a command published in the GitHub repository smrafiz/claude-supercharger (11 stars, last pushed today), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 522 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
commit
A command that examines staged Git changes and proposes a commit message using the Conventional Commits format, such as feat, fix, or docs. Git is a tool for tracking changes to code.
release-notes
Generate consistent, well-structured release notes from git history. Triggered on release tags following semver patterns (v..) to produce categorized changelog with breaking changes, features, fixes, and contributor attribution.
doctor
Diagnosticar y reparar problemas del framework Don Cheli, git y entorno. Usa cuando el usuario dice "doctor", "problemas del framework", "don cheli no funciona", "repair Don Cheli", "debug setup", "setup broken", "framework broken", "reparar entorno". Detecta y repara issues de configuración, git y dependencias…
repo-audit
Audit a codebase (local or remote GitHub/GitLab) against architecture principles and requirements, surfacing drift, risk, and missing decisions.
handoff
Export a Waybill Bundle by default, or import one when requested.
pr
Handle the full workflow from current branch state to an open, CI-monitored pull request.