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.
npx skills add motlin/claude-code-plugins --skill conflictsgit clone --depth 1 https://github.com/motlin/claude-code-pluginsWrote 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/skills/motlin/claude-code-plugins/conflicts)<a href="https://agentmods.dev/skills/motlin/claude-code-plugins/conflicts"><img src="https://agentmods.dev/badge/skills/motlin/claude-code-plugins/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/skills/motlin/claude-code-plugins/conflicts"><img src="https://agentmods.dev/badge/skills/motlin/claude-code-plugins/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.00033 | $0.00311 |
| Opus 5.5 | $0.00013 | $0.00124 |
| Sonnet 5.5 | $0.00007 | $0.00062 |
| Haiku 4.5 | $0.00003 | $0.00031 |
Grade A, and why
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
Conflicts
Use the code:cli skill.
Run git status to see the operation in progress and the conflicted files. Resolve each file by keeping the correct side or combining both, and remove every conflict marker, then stage them with git add <resolved-files>.
Continue the operation that is actually in progress. git rev-parse --git-path <name> resolves each marker correctly inside worktrees:
| Marker present | Operation | Continue with |
|---|---|---|
rebase-merge/ or rebase-apply/ |
rebase | git rebase --continue |
MERGE_HEAD |
merge | git merge --continue |
CHERRY_PICK_HEAD |
cherry-pick | git cherry-pick --continue |
REVERT_HEAD |
revert | git revert --continue |
Check the rebase markers first; they take precedence over any other marker a stopped rebase leaves behind. When --continue would open an editor, prefix it with GIT_EDITOR=true to keep the default message.
If the operation stops on more conflicts, repeat.
Finish by checking git status and recent commit history to confirm the operation completed.
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 Changed · +6 lines ccb955cb8f38
- 22d ago Changed · -11 lines 42b7e09040e0
- 1mo ago First seen · 31 lines · 33 tokens per session scan A 0f1041360e25
conflicts is a skill published in the GitHub repository motlin/claude-code-plugins (20 stars, last pushed yesterday), licensed Apache-2.0. It adds 33 tokens to every session and 311 once invoked, about $0.0001 per session on Opus 5.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-09-19.
Other skills, from other repositories
git-advanced-workflows
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
agent-merge-conflict-arbiter
Neutral arbiter for merge conflicts between two agents.
enable-check-includes-strict
Enable and migrate Chromium targets and directories to checkincludesstrict = true, diagnosing and resolving header include violations as part of the checkincludesstrict LSC. Use when adding directories to the allowlist, enabling strict header checks on targets, or resolving CHECKINCLUDESSTRICTUNTRIAGED targets.
resolve-handoff
Emit the complete Resolve handoff with exact modes, outcomes, test evidence, and publication state.
reproduce-and-fix-issues
Reproduce triaged Slack bugs through a configured app-control adapter, verify existing fixes, and open a bounded draft pull request only after before-and-after proof. Use only from the configured Benny repro automation.
comet-github-issue-fix
A workflow for fixing a confirmed Comet-related GitHub issue or review blocker within an isolated scope. It covers matching the work to the relevant workflow, testing the change, checking runtime results, and preparing a careful handoff.