resolve-merge-conflicts SKILL.md skillA
resolve-merge-conflicts from outlinedriven/odin-claude-plugin is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add outlinedriven/odin-claude-plugin/resolve-merge-conflicts@git:20260904.2014e73Pins git:20260904.2014e73 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- outlinedriven/odin-claude-plugin
- Path
plugins/odin-git/skills/resolve-merge-conflicts/SKILL.md- Versions recorded
- 5
- Latest version
- git:20260904.2014e73, committed Sep 4, 2026
- First version recorded
- Sep 3, 2026
- Size
- 7,552 bytes
- Repository stars
- 40
- License
- Apache-2.0
Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts. Not for people-mediation conflicts: use culture-conflict-mediation.
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 ## Contract | Field | Bound contract | |---|---| | Trigger | A merge, rebase, cherry-pick, or stash pop stops on conflicts: `git` exits with unmerged paths. | | Authority | Reversible local: writes only conflicted-file edits, staged resolutions, regenerated lockfiles, and integration continuation (committing a merge, `git rebase --continue`, `git cherry-pick --continue`, and `git stash drop` only after the resolution is committed); runs scoped checks; rollback is `git merge --abort`, `git rebase --abort`, `git cherry-pick --abort`, or `git checkout -- <file>`. No remote mutation. No push, no tag, no force-push. | | Side effect | Edits conflicted files, stages resolutions, regenerates lockfiles with package manager tooling, runs scoped checks, completes the in-progress integration. | | Done | No unmerged paths, no conflict markers in any tracked file, scoped checks pass, integration is committed and complete. | ## Refusal …
Read the whole file at its exact version.
How to install
mdr add outlinedriven/odin-claude-plugin/resolve-merge-conflicts@sha256:b0404d06da2a481dThe line at the top of this page pins the label git:20260904.2014e73, 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_2l37azzlbnohc2zn)
4 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 5 versions of this file, between Sep 3, 2026 and Sep 4, 2026, more than one a day.
| 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 · 40 stars · license Apache-2.0 · pushed 2026-09-29 · 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
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 outlinedriven/odin-claude-plugin
Every file in outlinedriven/odin-claude-plugin