resolving-merge-conflicts is agent-read markdown (skill) from mambo-wang/codewiki-plus: Use when you need to resolve an in-progress git merge/rebase conflict..
Indexed from public GitHub and served as immutable, content-addressed versions. Install it pinned to an exact SHA-256 with the mdr CLI, and every file is verified against the hash recorded here before it reaches your agent. The deterministic audit below grades the latest version, and the same file always earns 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.
Pin to a label to follow the author's releases, or to a sha256 to freeze the exact bytes forever. Either way the resolved hash is written to mdr.lock, and mdr install reproduces it on any machine.
GET https://markdownregistry.com/api/v1/artifacts/art_bkngiei4j2l2yxpn
GET https://markdownregistry.com/api/v1/resolve?ref=mambo-wang/codewiki-plus/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/9d8114f8ef0b31f535a265fc05c364bd8cf2e2895a830040e06c22acb11f54b0
Your agent 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.
mambo-wang/codewiki-plus · .codebuddy/skills/blog-writing-specialist/SKILL.md · Comprehensive blog writing skill that handles technical blog posts, personal voice writing, brain dump transformation…
mambo-wang/codewiki-plus · .codebuddy/skills/claude-handoff/SKILL.md · Hand the current conversation off to a fresh background agent that picks up the work immediately.
mambo-wang/codewiki-plus · .codebuddy/skills/code-review/SKILL.md · Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes: Standards (does the code…
mambo-wang/codewiki-plus · .codebuddy/skills/codebase-design/SKILL.md · Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find…
mambo-wang/codewiki-plus · .codebuddy/skills/diagnosing-bugs/SKILL.md · Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports…
mambo-wang/codewiki-plus · .codebuddy/skills/domain-modeling/SKILL.md · Build and sharpen a project's domain model. Use when discussing codebase terminology, writing or editing a CONTEXT.md…
mambo-wang/codewiki-plus · .codebuddy/skills/git-guardrails-claude-code/SKILL.md · Set up Claude Code hooks to block dangerous git commands (push, reset --hard, clean, branch -D, etc.) before they…
mambo-wang/codewiki-plus · .codebuddy/skills/grill-with-docs/SKILL.md · A relentless interview to sharpen a plan or design, which also creates docs (ADR's and glossary) as we go.
mambo-wang/codewiki-plus · .codebuddy/skills/grilling/SKILL.md · Grill the user relentlessly about a plan, decision, or idea. Use when the user wants to stress-test their thinking, or…
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/claude-code-dev-hermit/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.
aethrox/doctrine · skills/resolving-merge-conflicts/SKILL.md · Discipline for resolving an in-progress git merge or rebase conflict, a conflict marker names two divergent intents…
mambo-wang/codewiki-plus · .codebuddy/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
ethanyoq/skill-hub · archives/user-installed-skills/resolving-merge-conflicts/1c694fde7b72c14d/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
