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 JakubMikolajek/codex-skills-collection --skill resolving-merge-conflictsgit clone --depth 1 https://github.com/JakubMikolajek/codex-skills-collectionWrote 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/jakubmikolajek/codex-skills-collection/resolving-merge-conflicts)<a href="https://agentmods.dev/skills/jakubmikolajek/codex-skills-collection/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/jakubmikolajek/codex-skills-collection/resolving-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/jakubmikolajek/codex-skills-collection/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/jakubmikolajek/codex-skills-collection/resolving-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.00039 | $0.00812 |
| Opus 5 | $0.00019 | $0.00406 |
| Sonnet 5 | $0.00008 | $0.00162 |
| Haiku 4.5 | $0.00004 | $0.00081 |
Grade A, and why
resolving-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 11d 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 — 88 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Resolving Merge Conflicts
This skill resolves active merge and rebase conflicts without blindly choosing a side or losing either change's intent.
When to Use
git statusshows an in-progress merge or rebase withUnmerged paths- The working tree contains conflict markers from an active merge or rebase
- User asks to resolve, continue, or finish a conflicted merge or rebase
When NOT to Use
- No merge or rebase is in progress — this skill resolves an existing operation; it does not start one
- A trivial conflict is already fully understood and intent tracing would be pure overhead — still run a quick sanity check
Core Principle
Intent-Traced Resolution
- For each conflicting hunk, find the primary source for each side's change: commit message, PR or issue description, linked ticket
- Understand why each change was made before choosing a resolution
- Never pick
oursortheirsblindly
Resolution Process
Use the checklist below and track your progress:
Merge conflict resolution progress:
- [ ] Step 1: Assess operation state and list conflicted files
- [ ] Step 2: Read each conflicted hunk and trace both sides' intent
- [ ] Step 3: Resolve each hunk without inventing behavior
- [ ] Step 4: Run relevant automated checks after each file is resolved
- [ ] Step 5: Stage resolved files and continue the operation
Step 1 — Assess current state
- Run
git status - List conflicted files:
git diff --name-only --diff-filter=U - Confirm whether the active operation is a merge or rebase
Step 2 — Trace intent hunk by hunk
- Read both sides of every conflicting hunk
- Find each side's primary source: commit message, PR or issue description, linked ticket
- Record why each side changed the code before resolving the hunk
Step 3 — Resolve deliberately
- Preserve both intents where possible
- Where intents are genuinely incompatible, choose the one matching the merge's stated goal
- Explicitly note the trade-off in a code comment or merge commit message
- Never silently discard the other side's work
- Do not invent behavior beyond what either side already expressed
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.
- 11d ago First seen · 88 lines · 39 tokens per session scan A 7a65479d24c8
resolving-merge-conflicts is a skill published in the GitHub repository JakubMikolajek/codex-skills-collection (5 stars, last pushed 6d ago), licensed MIT. It adds 39 tokens to every session and 812 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-08-31.
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.
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.
changelog-composer
Generates structured changelogs and release notes from git history and PRs, classifying breaking changes, features, fixes, performance, docs. Triggers on: "generate changelog", "write release notes", "what changed since", "prepare release", "release notes for", "diff since tag".
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…