Borrowing it
Nothing to install: this file belongs to vdaubry/bottega. 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/vdaubry/bottega/main/.claude/commands/fix-conflicts.mdgit clone --depth 1 https://github.com/vdaubry/bottegaWrote 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/vdaubry/bottega/fix-conflicts)<a href="https://agentmods.dev/commands/vdaubry/bottega/fix-conflicts"><img src="https://agentmods.dev/badge/commands/vdaubry/bottega/fix-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/vdaubry/bottega/fix-conflicts"><img src="https://agentmods.dev/badge/commands/vdaubry/bottega/fix-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.00017 | $0.00057 |
| Opus 5.5 | $0.00007 | $0.00023 |
| Sonnet 5.5 | $0.00003 | $0.00011 |
| Haiku 4.5 | $0.00002 | $0.00006 |
Grade A, and why
fix-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 24d 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
Fix conflicts on the opened PR corresponding to this worktree, then run all unit tests, then commit and push, monitor CI to make sure the PR is fully mergeable.
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.
- 24d ago First seen · 6 lines · 17 tokens per session scan A 53daf688108b
fix-conflicts is a command published in the GitHub repository vdaubry/bottega (88 stars, last pushed 24d ago), licensed MIT. It adds 17 tokens to every session and 57 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-10-06.
Other commands, from other repositories
mach12:pr-pre-merge
Run the pre-merge checklist - branch freshness, docs, version, CHANGELOG, tests, CI.
test-audit
Writes a versioned TESTAUDIT.md; with --fix, quarantines the rot in gated, revertible commits. TRIGGER WHEN: auditing a test suite, measuring test health, finding dead or flaky or redundant tests, or diagnosing failure causes and proposing temporary quarantine. DO NOT TRIGGER WHEN: one module's tests are consolidated…
mach12:pr-validation
Challenge a PR through independently assessed executable tests.
mach12:push
Commit, push, and post a progress comment using session context or branch detection.
pre-pr
Run complete validation workflow before creating PR.
commit
When you receive this command, do the following.