Resolve an in-progress git merge or rebase conflict by tracing each side's intent back to primary sources before touching a hunk; always resolve, never --abort
Installs into .claude/skills of the current project.
Sponsors
SSkills DirectorySkills Directory
Know which skills are safe — weekly.
SSkills DirectorySkills Directory
Is that skill safe to install?
SSkills Directory ProSkills Directory
Get any skill into Claude in one click.
Are you the author of Orc Resolving Merge Conflicts?
Add the live security badge to your README. It updates with every re-scan.
[](https://www.skillsdirectory.com/skills/higoralves-orc-resolving-merge-conflicts)
---
name: orc-resolving-merge-conflicts
description: "Resolve an in-progress git merge or rebase conflict by tracing each side's intent back to primary sources before touching a hunk; always resolve, never --abort"
---
Read `../../RUNTIME.md` first, then `../../content/skills/resolving-merge-conflicts/SKILL.md` and follow that workflow.
Resolve paths relative to this installed skill directory. The plugin root is two directories above it.
Pass the user's arguments to the workflow. Load referenced phase modules only when needed.
