resolve-merge skillA
resolve-merge is agent-read markdown (skill) from reidemeister94/development-skills: Resolve an active merge or rebase conflict, including safe renumbering of colliding plans and chronicles..
Indexed from public GitHub and served as immutable, content-addressed versions. Install it pinned to an exact SHA-256 with the mdr CLI, and every file is verified against the hash recorded here before it reaches your agent. The deterministic audit below grades the latest version, and the same file always earns 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 at another number (duplicate). - Lock file → checkout one side, regenerate via the package manager. - `CHANGELOG.md` → merge unique entries, dedupe, keep category order. 4. For legacy `NNNN__` plans and chronicles in the conflict, keep THEIRS numbers. Renumber colliding OURS-only files and repair their references. Date-and-slug files use no counter. Reconcile the same task or use distinct slugs for different tasks. 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. 7. For each JUDGMENT file, show exact OURS and THEIRS hunks plus the proposed merge. Ask Approve / Edit / Skip; Skip leaves it conflicted. …
Read the whole file at its exact version.
How to install
mdr add reidemeister94/development-skills/resolve-merge@git:20260919.a9f7da5mdr add reidemeister94/development-skills/resolve-merge@sha256:a0ff6d6d00c12ea0Pin to a label to follow the author's releases, or to a sha256 to freeze the exact bytes forever. Either way the resolved hash is written to mdr.lock, and mdr install reproduces it on any machine.
[](https://markdownregistry.com/a/art_wazm4napf2vjs24s)
1 badge views in 30 days
Versions
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260919.a9f7da5 latest | 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 (1868 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-09-20 · 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/a0ff6d6d00c12ea02d65a664de70305e6d0abe2cd66d38b56251256e11393446
Your agent 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.