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. Continue toward the requested merge or rebase. Do not abort it unless the user requests that change of intent.
4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
5. **Finish the requested merge/rebase.** Stage the resolution files while preserving unrelated local changes. Commit the merge or continue the rebase until its commits are resolved, following the user’s requested Git workflow.
The line at the top of this page pins the label git:20261011.ef64499, 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_5fgqnwcwaigacnza
GET https://markdownregistry.com/api/v1/resolve?ref=transitive-bullshit/skills/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/8dc40d6c8cf1ed49d0e5316eae263a9b99fae3ad4d977dc563c7cb898f54dcee
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.
transitive-bullshit/skills · provenance/upstream/auto-research/skill/SKILL.md · Run fast, progressive experiments to map tunable parameters and their effects. Use when optimizing code, prompts…
transitive-bullshit/skills · provenance/upstream/better-colors/SKILL.md · Helps you build and check a color system for your project. It generates palettes, names semantic tokens, converts…
transitive-bullshit/skills · provenance/upstream/better-layout/SKILL.md · Helps with grouping, alignment, reading order, responsive structure and room for translated text, so a layout holds up…
transitive-bullshit/skills · provenance/upstream/better-typography/SKILL.md · Sets and reviews how text renders in your product, from the type scale and spacing to font features, wrapping…
transitive-bullshit/skills · provenance/upstream/better-ui/SKILL.md · Polishes the surfaces, icons and motion in your project with exact values for border radius, optical alignment…
transitive-bullshit/skills · provenance/upstream/better-writing/SKILL.md · Writes and reviews your interface copy, from labels and errors to empty states and confirmations, so it matches your…
transitive-bullshit/skills · provenance/upstream/claude/skill/SKILL.md · Use Claude Code as an independent `claude -p` subagent when the user explicitly asks for Claude, wants a second-agent…
transitive-bullshit/skills · provenance/upstream/codebase-design/skill/SKILL.md · Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find…
transitive-bullshit/skills · provenance/upstream/codex/skill/SKILL.md · Use the local Codex CLI as an independent second agent. Two branches — (1) proactively run `codex review` for a second…
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.
