resolve-merge SKILL.md skillA
resolve-merge from reidemeister94/development-skills is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add reidemeister94/development-skills/resolve-merge@git:20261031.a82a617Pins git:20261031.a82a617 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- reidemeister94/development-skills
- Path
skills/resolve-merge/SKILL.md- Versions recorded
- 6
- Latest version
- git:20261031.a82a617, committed Oct 31, 2026
- First version recorded
- Jun 3, 2026
- Size
- 1,915 bytes
- Repository stars
- 12
- License
- MIT
Resolve an active merge or rebase conflict, including plans and chronicles with colliding names.
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 Merge Conflicts 1. Verify `MERGE_HEAD` or `REBASE_HEAD`; otherwise stop with `No merge in progress.` 2. Before any write, list conflicts and classify each as AUTO or JUDGMENT. 3. AUTO requires mechanical proof; default to JUDGMENT. AUTO cases: - Sides byte-identical (`git show :2:<f>` vs `:3:<f>`) or differing only in whitespace/EOL → take either. - AU → `git add`, but `git rm` if its slug already exists in theirs under another name (duplicate). - Lock file → checkout one side, regenerate via the package manager. - `CHANGELOG.md` → merge unique entries, dedupe, keep category order. 4. When an OURS-only `NNNN__` plan or chronicle collides with a THEIRS number, keep THEIRS. Rename OURS to `YYYY-MM-DD__<slug>.md` with its own date and slug. Repair paired records, research, and cross-references. When date names collide, reconcile the same task or give different tasks distinct slugs. 5. Show every conflict with file, code, action, and classification. Ask once: Approve / Modify / Abort. Abort writes nothing. 6. Apply approved AUTO actions; report only counts and failures. …
Read the whole file at its exact version.
How to install
mdr add reidemeister94/development-skills/resolve-merge@sha256:3eb023c8ca6fdf04The line at the top of this page pins the label git:20261031.a82a617, 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_wazm4napf2vjs24s)
4 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 6 versions of this file, between Jun 3, 2026 and Oct 31, 2026, about one every 30 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261031.a82a617 latest | 2026-10-31 | a82a617 | 1,915 B | A | view · diff |
| git:20260919.a9f7da5 | 2026-09-19 | a9f7da5 | 1,868 B | A | view · diff |
| git:20260724.ba2c70f | 2026-07-24 | ba2c70f | 1,805 B | A | view · diff |
| git:20260713.d210701 | 2026-07-13 | d210701 | 2,440 B | A | view · diff |
| git:20260617.174aad8 | 2026-06-17 | 174aad8 | 2,755 B | A | view · diff |
| git:20260603.5f7bc25 | 2026-06-03 | 5f7bc25 | 2,862 B | A | view |
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 (1915 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
reidemeister94/development-skills · 12 stars · license MIT · pushed 2026-10-31 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_wazm4napf2vjs24s GET https://markdownregistry.com/api/v1/resolve?ref=reidemeister94/development-skills/resolve-merge GET https://markdownregistry.com/api/v1/blob/3eb023c8ca6fdf043c32a82e50df6ad038e0256761dccdf0f9ad452a63945b5b
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.