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 agentmods add skills/fmind/dot/resolve-conflictsnpx skills add fmind/dot --skill resolve-conflictsgit clone --depth 1 https://github.com/fmind/dotWrote 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/fmind/dot/resolve-conflicts)<a href="https://agentmods.dev/skills/fmind/dot/resolve-conflicts"><img src="https://agentmods.dev/badge/skills/fmind/dot/resolve-conflicts.svg" alt="Measured on agentmods" 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 | $0.00040 | $0.01043 |
| Opus 5 | $0.00020 | $0.00522 |
| Sonnet 5 | $0.00008 | $0.00209 |
| Haiku 4.5 | $0.00004 | $0.00104 |
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 yesterday.
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.
How it starts
The opening of the file, as written. The whole thing — 53 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Resolve Conflicts
Finish a stopped git merge or git rebase by understanding what each side meant, not by picking a side. Never --abort to make the problem disappear, and never "take ours" unless history shows the other change is obsolete. Branch naming lives in feature-branch; committing and pushing in git-add-commit-push.
Workflow
- Map the state: which operation stopped, which files conflict, and which commits touch them.
git status --short # UU both modified; AU, UA, DU, UD: added or deleted on one side git diff --name-only --diff-filter=U git log --merge --oneline -- <file> # commits from both heads that touch the file - Read both intents: for each file, compare the working tree with the three stages and read the history behind each side (commit messages, linked pull requests and issues) before touching a hunk.
git diff --base <file> # against the common ancestor git diff --ours <file> # against our side (rebase: the branch being rebased onto) git diff --theirs <file> # against their side (rebase: the commit being replayed) git log -p $(git merge-base HEAD MERGE_HEAD)..MERGE_HEAD -- <file> # rebase: REBASE_HEAD - Resolve semantically: write the code that satisfies both intents (renamed function plus new caller, both new tests, merged config keys). When intents are incompatible, keep the one matching the merge's goal and record the trade-off in the commit body. Do not invent new behavior, and remove every
<<<<<<<,=======,>>>>>>>marker. - Continue: stage the resolved files and resume; repeat per commit during a rebase.
git add <file>... git rebase --continue # or: git merge --continue - Prove it: Run the full gate (
mise run all); if the tree carries unrelated changes and the gate write-formats, run it in a temporarygit worktreeor fall back tomise run checkandmise run test(see mise). Fix what the merge broke before pushing. - Push: a rebased private branch needs
git push --force-with-lease; never force-push a shared branch (main, or one others build on), merge into it instead.
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.
- yesterday First seen · 53 lines · 40 tokens per session scan A b74b176bef73
resolve-conflicts is a skill published in the GitHub repository fmind/dot (4 stars, last pushed today), licensed MIT. It adds 40 tokens to every session and 1,043 once invoked, about $0.0002 per session on Opus 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-03.
Other skills, from other repositories
go-stack
Build Go projects, libraries, CLIs, TUIs, web apps, or ADK agents with the standard package layout and pinned tooling.
python-stack
Build typed Python projects with uv, Ruff, ty, pytest, Litestar, and Typer. Use for packages, CLIs, web apps, tests, typing, or API verification.
chezmoi
Manage chezmoi dotfiles: source naming, Go templates, age-encrypted secrets, and the edit-source then apply/diff workflow.
hugo
Canonical Hugo static-site stack with the Hextra docs theme — Hugo Modules, mise tasks, dprint, lefthook, and GitHub Pages deploy. Use for documentation sites, project docs, and static websites.
k8s-local
Create and manage local Kubernetes clusters (k3d or kind) and deploy to them with kubectl, helm, helmfile, and skaffold. Use for local k8s cluster setup, dev loops, and debugging.
release
Cut or verify a versioned release — bump semver, generate the changelog with git-cliff, tag and publish on GitHub, or reconcile an already-published tag and assets.