mkl-resolve-merge-conflict SKILL.md skillA
This file is byte-identical to the first copy the registry indexed, one of 5 indexed copies. Same content hash, so the same checks give both the same grade.
mkl-resolve-merge-conflict from 00200200/maintainer-skills-lab is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add 00200200/maintainer-skills-lab/mkl-resolve-merge-conflict@git:20261015.62d41fePins git:20261015.62d41fe in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- 00200200/maintainer-skills-lab
- Path
providers/windsurf/.windsurf/skills/mkl-resolve-merge-conflict/SKILL.md- Versions recorded
- 1
- Latest version
- git:20261015.62d41fe, committed Oct 15, 2026
- Size
- 2,430 bytes
- Repository stars
- 48
- License
- MIT
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 …
Read the whole file at its exact version.
How to install
mdr add 00200200/maintainer-skills-lab/mkl-resolve-merge-conflict@sha256:e1b0d75bf40c7445The 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.
[](https://markdownregistry.com/a/art_n2lzsjdbycptc5ow)
1 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 1 version of this file, committed on Oct 15, 2026.
Audit of the latest version
- pass: Frontmatter block present
- pass: Frontmatter declares a name
- pass: Frontmatter declares a description
- pass: Size between 200 bytes and 200 KB (2430 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
00200200/maintainer-skills-lab · 48 stars · license MIT · pushed 2026-11-07 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_n2lzsjdbycptc5ow 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.
Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.
More from 00200200/maintainer-skills-lab
Every file in 00200200/maintainer-skills-lab