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 tonyghiani/ai-essentials --skill resolve-merge-conflictsgit clone --depth 1 https://github.com/tonyghiani/ai-essentialsWrote 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/tonyghiani/ai-essentials/resolve-merge-conflicts)<a href="https://agentmods.dev/skills/tonyghiani/ai-essentials/resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/tonyghiani/ai-essentials/resolve-merge-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/tonyghiani/ai-essentials/resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/tonyghiani/ai-essentials/resolve-merge-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.00079 | $0.01082 |
| Opus 5.5 | $0.00032 | $0.00433 |
| Sonnet 5.5 | $0.00016 | $0.00216 |
| Haiku 4.5 | $0.00008 | $0.00108 |
Grade A, and why
resolve-merge-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.
How it starts
The opening of the file, as written. The whole thing — 58 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Resolve merge conflicts
Conflicts are two intents colliding, not two texts. Work out what each side was trying to do, then write the result that satisfies both.
1. Pin down the merge
- Run
git branch --show-currentandgh pr view <n> --json baseRefName,headRefName. "Conflicts against X" means merge the PR base into the current branch, not the other way round. - Check
git rev-parse --abbrev-ref @{u}andgit remote -v. Forks are common: the tracking remote is where you push, and it may not beorigin. git fetch <remote> <base>, thengit merge <remote>/<base>. Merge, do not rebase, unless the user asks: epic branches carry merge history reviewers rely on.- List what is left:
git status --short | grep -E '^(UU|AA|DU|UD|AU|UA|DD)'.
2. Find the intent behind each conflict
For every conflicted file, answer two questions before editing:
- What did our side change, and in which PR?
git log --oneline -3 HEAD -- <file>andgit diff $(git merge-base HEAD <base>) HEAD -- <file>. - What did the base change, and in which PR? Same commands against
<remote>/<base>.
Then pick a strategy by shape:
| Shape | Resolution |
|---|---|
| Both sides edited the same lines | Take the structure of the side that restructured (usually the base), then re-apply the other side's semantic change on top. Typical case: base rewrites a block, we renamed a field inside it. |
| Modify/delete | The deleter's intent wins unless our change is the point of the branch. Delete the file, then grep for imports and identifiers it exported; carry our change into whatever replaced it. |
Generated artifact (schemas, snapshots, lockfiles, index.json with hashes) |
Do not hand-merge. Regenerate if the generator is runnable. If it needs a running stack, take the base's file, re-apply our semantic delta (diff both sides against the merge base with a small JSON flattener to isolate it), then recompute checksums. Confirm the checksum method by hashing the base's own file first. |
| Duplicate work (both sides fixed the same thing) | Keep the base's version; drop ours. |
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 · 58 lines · 79 tokens per session scan A 4dd48beaf795
resolve-merge-conflicts is a skill published in the GitHub repository tonyghiani/ai-essentials (7 stars, last pushed 9d ago), licensed MIT. It adds 79 tokens to every session and 1,082 once invoked, about $0.0003 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-08.
Other skills, from other repositories
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.
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.
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.
re0-merge
Review and land an external contribution the way this suite does: gate it against the thesis, land it with the author's credit intact, complete a new skill rather than merging it raw, then approve, credit, and explain before closing. Use when reviewing a pull request, as any collaborator or maintainer, not only the…