resolve-merge-conflicts
Installation
SKILL.md
Resolve Merge Conflicts
Overview
Finish a conflicted merge or rebase with a result both sides would recognise: every hunk resolved deliberately, nothing invented, nothing dropped in silence. Resolution is a reading task before it is an editing task — the markers show where two changes collide, never which one is right.
When to Use
- User says "resolve the conflicts", "fix this merge", "I am mid-rebase", "finish the rebase", or "there are conflict markers".
- User triggers
/resolve-merge-conflicts.