resolving-merge-conflicts is agent-read markdown (skill) from j-star-films-studios/vibecode-protocol-suite: 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_c35nqwnqnihvkphz
GET https://markdownregistry.com/api/v1/resolve?ref=j-star-films-studios/vibecode-protocol-suite/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.
More from j-star-films-studios/vibecode-protocol-suite
j-star-films-studios/vibecode-protocol-suite · .agents/skill-curator/SKILL.md · Use when adding, importing, reorganizing, renaming, or refactoring skills according to the Lean Unified Skills…
j-star-films-studios/vibecode-protocol-suite · .agents/skills/unslop/SKILL.md · Use when writing any text, chat responses, documentation, UI copy, or skill instructions. Cuts AI tells, filler, and…
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/agent-engineering/arena/SKILL.md · Spawn N parallel candidates at the same task, pick a base, graft the strongest parts of the losers into it. Use for…
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/agent-engineering/automate-me/SKILL.md · Use for "automate me", "create/update/refresh my -mode skill", "turn/capture my preferences or working style into a…
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/agent-engineering/conversation-to-spec/SKILL.md · Turn the current conversation into a spec and publish it to the project issue tracker: no interview, just synthesis of…
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/agent-engineering/crafting-effective-readmes/SKILL.md · Use when writing or improving README files. Not all READMEs are the same — provides templates and guidance matched to…
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/agent-engineering/create-verification-skill/SKILL.md · Generate a project-local verification skill that drives your app the way a user does — any language, framework, or…
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/agent-engineering/domain-modeling/SKILL.md · Build and sharpen a project's domain model. Use when discussing codebase terminology, writing or editing a CONTEXT.md…
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/agent-engineering/expert-system-engineer/SKILL.md · Use when engineering knowledge-based expert systems using CommonKADS methodology, MYCIN/EMYCIN rule patterns, certainty…
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.
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.
