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.
---
*Adapted from [mattpocock/skills](https://github.com/mattpocock/skills) (MIT, Copyright 2026 Matt Pocock)*
The line at the top of this page pins the label git:20261002.2f2da1b, 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_zlwhq6cfhxfh4lew
GET https://markdownregistry.com/api/v1/resolve?ref=gtapps/claude-code-hermit/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/592d399df0706d91d47cd828d46acc04163394bb546c591e81ebcf4932a67e6f
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.
gtapps/claude-code-hermit · .agents/skills/bump-core-req/SKILL.md · Updates the minimum core version requirement for a fleet plugin in all three canonical places: `required_core_version`…
gtapps/claude-code-hermit · .agents/skills/claude-harness-canary/SKILL.md · Run the minimum current-Claude compatibility canary for hermitd by driving real interactive Claude Code instances in…
gtapps/claude-code-hermit · .agents/skills/commit/SKILL.md · Changelog and commit — lightweight motion for day-to-day plugin dev work in the monorepo. One commit per plugin scope…
gtapps/claude-code-hermit · .agents/skills/docs-drift/SKILL.md · Documentation-drift audit for this plugin monorepo. Audit either each scoped plugin's unreleased changelog claims or…
gtapps/claude-code-hermit · .agents/skills/downstream-impact/SKILL.md · Explain in plain language what a fix, feature, PR, or plan will actually change for downstream hermits and the…
gtapps/claude-code-hermit · .agents/skills/fleet-release/SKILL.md · Use this skill whenever the user wants to release, ship, prep, or cut versions for two or more plugins together on the…
gtapps/claude-code-hermit · .agents/skills/pipeline-digest/SKILL.md · Daily release-pipeline digest with a change gate — reports which plugins are pending release, whether main's CI is…
gtapps/claude-code-hermit · .agents/skills/pre-release-review/SKILL.md · Run the pre-release gate for this multi-plugin monorepo: establish each plugin's release boundary from its last…
gtapps/claude-code-hermit · .agents/skills/pricing-refresh/SKILL.md · Refresh or verify the hermit cost rate table against Anthropic's live pricing. Use when the operator says "refresh…
gtapps/claude-code-hermit · .agents/skills/release-status/SKILL.md · Use this skill to answer "what's ready to ship?", "where does the release pipeline stand?", "any plugins awaiting…
gtapps/claude-code-hermit · .agents/skills/release/SKILL.md · Bump a plugin's version, write a detailed changelog entry for the upgrade skill to consume, and commit+push. Takes a…
gtapps/claude-code-hermit · .agents/skills/routine-test-ping/SKILL.md · Proof-of-life for the routine monitor. Appends one timestamped line to SHELL.md under Monitoring and stops. Fired by…
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.
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.
