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:20260821.05c0d52, 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_kljgjjht47wd22ln
GET https://markdownregistry.com/api/v1/resolve?ref=vodailocz/kilo-kit-mcp/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.
vodailocz/kilo-kit-mcp · skills/agent-frameworks/agent-memory/SKILL.md · Use when implementing or managing persistent, hierarchical memory systems for AI agents. Covers cross-session state…
vodailocz/kilo-kit-mcp · skills/agent-frameworks/mcp-agent-patterns/SKILL.md · Use when integrating or optimizing Model Context Protocol (MCP) servers and clients. Keywords: MCP, Model Context…
vodailocz/kilo-kit-mcp · skills/agent-frameworks/workflow-state-machines/SKILL.md · Use when designing, implementing, or debugging complex agentic workflows using state machine patterns. Keywords: state…
vodailocz/kilo-kit-mcp · skills/ai-media/ai-multimodal/SKILL.md · Process and generate multimedia content using Google Gemini API. Capabilities include analyze audio files…
vodailocz/kilo-kit-mcp · skills/ai-media/screenshot/SKILL.md · Use when the user explicitly asks for a desktop or system screenshot (full screen, specific app or window, or a pixel…
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.
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.
svyatov/supermatt · skills/resolving-merge-conflicts/SKILL.md · Resolves an in-progress git merge or rebase conflict by tracing why each side changed, reconciling every conflicted…
mambo-wang/codewiki-plus · .codebuddy/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
