Use when a git merge or rebase reports conflicts and the operation is in progress.
Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.
What the file says
<!-- Upstream: github.com/mattpocock/skills @ e9fcdf95 (skills/engineering/resolving-merge-conflicts)
Classification: ADAPTED (cc10x frontmatter + output conventions; 5-step body is Matt's). -->
# Resolving Merge Conflicts
Work through an in-progress git merge or rebase conflict **hunk by hunk**, resolving each by intent traced to each side's primary source. **Never `--abort`.** Always resolve; `--abort` throws away work and hides the real incompatibility.
## The 5 steps
### 1. See the current state
Check git status, the conflicting files, and the conflict markers:
```bash
git status
git diff --name-only --diff-filter=U # the unmerged paths
```
Read each conflicting file's conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) to see exactly what's contested. Know whether you're in a merge (`MERGE_HEAD` set) or a rebase (`rebase-merge/` or `rebase-apply/` present in `.git/`).
### 2. Find the primary sources for each side
For each conflict hunk, understand **why** each change was made and what its original intent was — don't just pick the bigger diff. Read:
- The commit messages on both sides (`git log --oneline -5 -- <file>` for each side)
…
The line at the top of this page pins the label git:20260719.252ad11, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.
A 17 of 17 checks passed. Fixed automatic checks with no AI involved, so the same checks give the same answer every run.
pass: Frontmatter block present
pass: Frontmatter declares a name
pass: Frontmatter declares a description
pass: Size between 200 bytes and 200 KB (2843 bytes)
pass: No zero-width or bidi control characters
pass: No instruction hidden inside an HTML comment
pass: No link to an exfiltration or paste host
pass: No credential-shaped string
pass: No instruction to send local credentials anywhere
pass: No text hidden with inline styles
pass: No prompt-injection phrasing
pass: No curl or wget piped into a shell
pass: No recursive delete of root, home or parent
pass: No instruction to read or print local credentials
pass: No base64 blob over 200 characters
pass: No link to a raw IP address
pass: No script tag
Source
GitHub
romiluz13/cc10x · 166 stars · license MIT · pushed 2026-10-21 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_jruuui3lhuxx4zp4
GET https://markdownregistry.com/api/v1/resolve?ref=romiluz13/cc10x/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/bbf4a536404805a7d8bce8bfc4cd5459c57479659fef99d05cc4c2d51e7fdbc5
Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.
romiluz13/cc10x · plugins/cc10x/skills/agent-common/SKILL.md · Use when a cc10x agent starts a task: the shared preamble for the memory protocol, the contract format, and the output…
romiluz13/cc10x · plugins/cc10x/skills/building/SKILL.md · Use when writing production code test-first: the RED-GREEN-REFACTOR cycle, false-RED
detection, vertical slicing, scope…
romiluz13/cc10x · plugins/cc10x/skills/cc10x-guide/SKILL.md · Answers questions about cc10x itself — what it is, how to install and configure it,
how the router, workflows, memory…
romiluz13/cc10x · plugins/cc10x/skills/debugging/SKILL.md · Use when diagnosing a defect or regression: feedback loop FIRST, root cause before fix,
blast radius after fix. Covers…
romiluz13/cc10x · plugins/cc10x/skills/diff-driven-docs/SKILL.md · Use when a BUILD phase completes, a commit is staged, or a PR is about to be created, and the diff has not yet been…
gtapps/hermitd · plugins/hermitd-dev/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
gtapps/claude-code-hermit · plugins/hermitd-dev/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
vodailocz/kilo-kit-mcp · skills/engineering/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/git-github-tools/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
svyatov/supermatt · skills/resolving-merge-conflicts/SKILL.md · Resolves an in-progress git merge or rebase conflict by tracing why each side changed, reconciling every conflicted…
mambo-wang/codewiki-plus · .codebuddy/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
