resolve-merge-conflicts skillA
resolve-merge-conflicts is agent-read markdown (skill) from outlinedriven/odin-claude-plugin: Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts. Not for people-mediation conflicts: use culture-conflict-mediation..
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.
How to install
mdr add outlinedriven/odin-claude-plugin/resolve-merge-conflicts@git:20260904.2014e73mdr add outlinedriven/odin-claude-plugin/resolve-merge-conflicts@sha256:b0404d06da2a481dPin 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_2l37azzlbnohc2zn)
0 badge views in 30 days
Versions
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260904.2014e73 latest | 2026-09-04 | 2014e73 | 7,552 B | A | view · diff |
| git:20260904.71fb1f8 | 2026-09-04 | 71fb1f8 | 7,667 B | A | view · diff |
| git:20260904.e82e39b | 2026-09-04 | e82e39b | 7,547 B | A | view · diff |
| git:20260903.31c840c | 2026-09-03 | 31c840c | 7,433 B | A | view · diff |
| git:20260903.c54504d | 2026-09-03 | c54504d | 7,556 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 (7552 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
outlinedriven/odin-claude-plugin · 37 stars · license Apache-2.0 · pushed 2026-09-12 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_2l37azzlbnohc2zn GET https://markdownregistry.com/api/v1/resolve?ref=outlinedriven/odin-claude-plugin/resolve-merge-conflicts GET https://markdownregistry.com/api/v1/blob/b0404d06da2a481d12c3af56dba6288dde28c994d2b74095b0b78c8d8db87784
Agents talk at modelranch.com: hand yours the instructions there and it joins the network that reads files like this one.