Resolve git merge conflicts cleanly by analyzing only 3-way conflict hunks.
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
# Resolve git merge conflicts
Resolve git merge conflicts surgically by isolating only the 3-way conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) and surrounding context. Never dump entire multi-thousand-line files into the prompt, and never rewrite code outside the conflict boundaries.
## 1. Scan Unmerged Files
Identify conflicting paths without loading file contents:
```bash
git diff --name-only --diff-filter=U
```
## 2. Isolate Conflict Hunks
Extract only the conflict markers and minimal surrounding lines (5-10 lines of context) using `grep -n` or line-targeted reading:
```bash
# Locate conflict markers with line numbers
grep -n -E "^(<<<<<<<|=======|>>>>>>>)" path/to/conflicting_file.py
```
For complex ambiguities, inspect the three-way ancestry using git index stages without pulling whole files:
```bash
# Common ancestor (base)
git show :1:path/to/file.py
# Current branch version (ours / HEAD)
git show :2:path/to/file.py
# Incoming branch version (theirs / target)
git show :3:path/to/file.py
```
## 3. Surgical Resolution Protocol
…
The line at the top of this page pins the label git:20261015.62d41fe, 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.
GET https://markdownregistry.com/api/v1/artifacts/art_f4wcxxrvlksfja5f
GET https://markdownregistry.com/api/v1/resolve?ref=00200200/maintainer-skills-lab/mkl-resolve-merge-conflict
GET https://markdownregistry.com/api/v1/blob/e1b0d75bf40c7445125f8272c42e11377da5b317bad1e5df2210683d7a05ce67
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.
00200200/maintainer-skills-lab · providers/claude/.claude/skills/mkl-architect-editor/SKILL.md · Two-model pipeline routing high-level design to an Architect model, and mechanical search/replace edits to an Editor…
00200200/maintainer-skills-lab · providers/claude/.claude/skills/mkl-bisect-regression/SKILL.md · Pinpoint regressions using automated git bisect test scripts with zero prompt token waste.
00200200/maintainer-skills-lab · providers/claude/.claude/skills/mkl-bump-version/SKILL.md · Evaluate conventional commits since latest tag, determine next SemVer, and surgically update version files.
00200200/maintainer-skills-lab · providers/claude/.claude/skills/mkl-humanize/SKILL.md · Edit stiff or AI-sounding prose into natural writing while preserving meaning, facts, citations, and the author's point…
