This file is byte-identical to the first copy the registry indexed, one of 8 indexed copies. Same content hash, so the same checks give both the same grade.
resolving-merge-conflicts from kriscard/skills is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
Use when you need to resolve an in-progress git merge/rebase conflict.
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
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.
2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.
4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
The line at the top of this page pins the label git:20261009.2a2674c, 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.
A 17 of 17 checks passed. Fixed automatic checks with no AI involved, so the same checks give the same answer every run.
pass: Frontmatter block present
pass: Frontmatter declares a name
pass: Frontmatter declares a description
pass: Size between 200 bytes and 200 KB (918 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
GitHub
kriscard/skills · 14 stars · license MIT · pushed 2026-10-15 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_ojtf3hah3p6ur7m4
GET https://markdownregistry.com/api/v1/resolve?ref=kriscard/skills/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/9d8114f8ef0b31f535a265fc05c364bd8cf2e2895a830040e06c22acb11f54b0
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.
kriscard/skills · skills/dev/analyze-repo/SKILL.md · Generate an evidence-backed visual architecture and technical-debt audit for an entire repository.
kriscard/skills · skills/dev/codebase-design/SKILL.md · Design and evaluate module interfaces, depth, seams, adapters, locality, and testability. Use when deciding what a…
kriscard/skills · skills/dev/pr-review/SKILL.md · Bug-first, evidence-only review of a pull request or branch-versus-base diff. Use when the user explicitly asks to…
kriscard/skills · skills/dev/react-hook-form/SKILL.md · Build and modify forms that use React Hook Form or whose project conventions require it. Use when implementing…
kriscard/skills · skills/dev/refactor/SKILL.md · Behavior-preserving code refactoring. Use when the user asks to simplify complex or duplicated code, improve naming…
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/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.
gtapps/hermitd · 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.
