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 jackfranklin/dotfiles --skill resolve-merge-conflictgit clone --depth 1 https://github.com/jackfranklin/dotfilesWrote 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/jackfranklin/dotfiles/resolve-merge-conflict)<a href="https://agentmods.dev/skills/jackfranklin/dotfiles/resolve-merge-conflict"><img src="https://agentmods.dev/badge/skills/jackfranklin/dotfiles/resolve-merge-conflict/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/jackfranklin/dotfiles/resolve-merge-conflict"><img src="https://agentmods.dev/badge/skills/jackfranklin/dotfiles/resolve-merge-conflict.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.00021 | $0.00348 |
| Opus 5.5 | $0.00008 | $0.00139 |
| Sonnet 5.5 | $0.00004 | $0.00070 |
| Haiku 4.5 | $0.00002 | $0.00035 |
Grade A, and why
resolve-merge-conflict 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 1mo 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
8 near-identical copies found in the catalogue:
- resolving-merge-conflicts — 88% identical, 13 lines differ
- resolving-merge-conflicts — 84% identical, 12 lines differ
- resolving-merge-conflicts — 84% identical, 12 lines differ
- resolving-merge-conflicts — 84% identical, 12 lines differ
- resolving-merge-conflicts — 84% identical, 12 lines differ
- resolving-merge-conflicts — 84% identical, 12 lines differ
- resolving-merge-conflicts — 84% identical, 12 lines differ
- resolving-merge-conflicts — 84% identical, 12 lines differ
What it actually says
-
Confirm authority and see the current state. Check the merge/rebase state, Git history, and conflicting files. If the user explicitly asked to resolve the conflicts, that authorizes resolution. If the conflict was only discovered while doing another task, inspect it without editing and ask for confirmation before resolving it.
-
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
-
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Never
--aborta user's merge/rebase without explicit authorization. If you are unsure of the correct resolution, stop and ask the user for clarification. -
Verify conflict markers. Before staging any resolved file, explicitly search it to ensure all conflict markers (
<<<<<<<,=======,>>>>>>>) have been removed. -
Discover the project's automated checks. Run only checks that do not modify tracked files. If a check may format or otherwise write files, or a failure requires changes beyond the resolved conflict files, ask the user before running it or making those changes.
-
Finish only the intended merge/rebase. Stage only the resolved conflict files. If unrelated staged or modified files are present, stop and ask which files to include. Commit the resolution, or continue the rebase process until all commits are rebased.
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.
- 1mo ago Changed · -1 lines 3abec2a2d830
- 1mo ago First seen · 18 lines · 21 tokens per session scan A 0a8b645da6f2
resolve-merge-conflict is a skill published in the GitHub repository jackfranklin/dotfiles (254 stars, last pushed 6d ago), licensed MIT. It adds 21 tokens to every session and 348 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-08-30.
Other skills, from other repositories
merge-batch
Prepare and merge an owner-selected PR batch with contributor credit and exact-candidate admission. Use for a pasted PR list; combined focused validation is diagnostic, and every actual landing still requires its applicable checks and authorization.
prowler-commit
Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.
gh-auth-isolation
Safely manage multiple GitHub identities (EMU + personal) in agent workflows.
comet-github
A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.
github-skill
Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.
release-helper
Ensures configuration and code changes are released correctly. Use PROACTIVELY whenever you edit config.json, change any setting, or fix a configuration bug in this project, so the change reaches production.