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 asymmetric-al/core 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:20260923.15c9348, 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_qwq526u2qbsrkmbd
GET https://markdownregistry.com/api/v1/resolve?ref=asymmetric-al/core/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.
asymmetric-al/core · .agents/skills/accessibility-review/SKILL.md · Audit and fix accessibility in Core UI. Use when changing or reviewing buttons, links, forms, validation, dialogs…
asymmetric-al/core · .agents/skills/agent-browser/SKILL.md · Browser automation CLI for AI agents. Use when the user needs to interact with websites, including navigating pages…
asymmetric-al/core · .agents/skills/agent-email-inbox/SKILL.md · Use when building any system where email content triggers actions — AI agent inboxes, automated support handlers…
asymmetric-al/core · .agents/skills/anim/SKILL.md · Tasteful, subtle web UI animation following Emil Kowalski / animations.dev principles. Use when adding or reviewing…
asymmetric-al/core · .agents/skills/animate/SKILL.md · Build an animation from scratch, making the decisions in the order that determines whether it feels right — should it…
asymmetric-al/core · .agents/skills/animation-vocabulary/SKILL.md · Reverse-lookup glossary that turns a vague description of a web animation or motion effect into its exact term ("the…
asymmetric-al/core · .agents/skills/api-design-principles/SKILL.md · Master REST and GraphQL API design principles to build intuitive, scalable, and maintainable APIs that delight…
asymmetric-al/core · .agents/skills/apple-design/SKILL.md · Apple's approach to interface design and fluid, physical motion, translated for the web. Use when building or reviewing…
asymmetric-al/core · .agents/skills/ask-sonner/SKILL.md · Guide to Sonner, the React toast library — install and wire up the Toaster, pick the right toast() call, promise and…
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.
