resolving-merge-conflicts from shumingyang-opencode/mattpocock-skills-zh-tw is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
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.
The line at the top of this page pins the label git:20260806.5bfe60b, 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.
GET https://markdownregistry.com/api/v1/artifacts/art_5i5feztol6rljkzg
GET https://markdownregistry.com/api/v1/resolve?ref=shumingyang-opencode/mattpocock-skills-zh-tw/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/73a58d9f2ba8147ff1fd9ab20266fa3f36efe8ce7191de9fcf69e58a5e7fa371
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.
romiluz13/cc10x · plugins/cc10x/skills/resolving-merge-conflicts/SKILL.md · Use when a git merge or rebase reports conflicts and the operation is in progress.
gtapps/hermitd · plugins/hermitd-dev/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
gtapps/claude-code-hermit · plugins/hermitd-dev/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
vodailocz/kilo-kit-mcp · skills/engineering/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/git-github-tools/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
mambo-wang/codewiki-plus · .codebuddy/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
