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 mlopscommunity/Coding-Agents-Conference-skills --skill merge-conflict-resolutiongit clone --depth 1 https://github.com/mlopscommunity/Coding-Agents-Conference-skillsWrote 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/mlopscommunity/coding-agents-conference-skills/merge-conflict-resolution)<a href="https://agentmods.dev/skills/mlopscommunity/coding-agents-conference-skills/merge-conflict-resolution"><img src="https://agentmods.dev/badge/skills/mlopscommunity/coding-agents-conference-skills/merge-conflict-resolution/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/mlopscommunity/coding-agents-conference-skills/merge-conflict-resolution"><img src="https://agentmods.dev/badge/skills/mlopscommunity/coding-agents-conference-skills/merge-conflict-resolution.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.00047 | $0.02176 |
| Opus 5.5 | $0.00019 | $0.00870 |
| Sonnet 5.5 | $0.00009 | $0.00435 |
| Haiku 4.5 | $0.00005 | $0.00218 |
Grade A, and why
merge-conflict-resolution 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 2mo 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 — 268 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Merge Conflict Resolution
Overview
The Merge Conflict Resolution Skill resolves both syntactic AND semantic merge conflicts from parallel agent work. This skill is essential when multiple agents or developers work on overlapping code simultaneously. While traditional merge tools catch syntax conflicts (merge markers), they miss semantic conflicts—situations where two changes logically contradict each other even though they don't overlap syntactically.
Core principle: Semantic conflicts are invisible to git but deadly at runtime. A human-like understanding of intent is required to resolve them correctly.
Dependency: Claude Code CLI with git and test infrastructure.
When to Use
- Merging multiple branches that touched overlapping code
- Combining work from parallel agents working on the same system
- After complex refactors that affect shared abstractions
- When API or schema changes intersect with dependent code
- Before considering a merge complete and ready to deploy
When NOT to Use
- Simple, fast-forward merges with no conflicts
- Merging unrelated branches (separate features, independent systems)
- Trivial merge conflicts (auto-mergeable, single-line disagreements)
Common Mistakes
| Mistake | Why it's wrong |
|---|---|
| Only resolving merge markers | Merge markers are the easy part. Semantic conflicts—logical contradictions—are what break code at runtime. |
| Not reading all commits/PRs since divergence | You need the full story of what both sides were trying to do. One commit in isolation won't tell you that. |
| Choosing one design without understanding both | Before picking A or B, understand the intent behind each. Sometimes a hybrid approach preserves both improvements. |
| Trusting test results if they pass silently | If the coding agent made assumptions, those same assumptions are baked into validation. Use fresh context to catch real issues. |
| Not flagging design decisions | If you chose one approach over another because it seemed better, but it's not objectively right, flag it for human review. |
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.
- 2mo ago First seen · 268 lines · 47 tokens per session scan A 847c6433be1e
merge-conflict-resolution is a skill published in the GitHub repository mlopscommunity/Coding-Agents-Conference-skills (39 stars, last pushed 7mo ago), licensed Apache-2.0. It adds 47 tokens to every session and 2,176 once invoked, about $0.0002 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.
merge-conflict-resolution compared with skills from other repositories
| Mod | Type | Stars | Last push | Licence | Scan | Tokens | Works with |
|---|---|---|---|---|---|---|---|
| merge-conflict-resolutionmlopscommunity/Coding-Agents-Conference-skills | Skill | 39 | 7mo ago | Apache-2.0 | A | 47 | Claude Code, Codex |
| merge-batchdiegosouzapw/OmniRoute | Skill | 85k | 4d ago | MIT | A | 46 | Claude Code |
| prowler-commitprowler-cloud/prowler | Skill | 15k | today | Apache-2.0 | A | 44 | Claude Code, Codex |
| gh-auth-isolationgithub/gh-aw | Skill | 5.6k | today | MIT | A | 20 | Claude Code, Codex |
| github-skillzeenie-ai/OpenCompany | Skill | 1.1k | today | MIT | A | 51 | Claude Code |
| comet-githubrpamis/comet | Skill | 3.3k | today | MIT | A | 72 | Claude Code, Codex |
| re0-mergeLilMGenius/paperthin | Skill | 1.4k | yesterday | MIT | A | 51 | Claude Code, Codex |