fix-merge-conflicts
Installation
SKILL.md
Fix Merge Conflicts
A conflict is two intents meeting in one file. Resolution that flattens either intent is a bug with a clean git status.
A conflict is two intents meeting in one file. Resolution that flattens either intent is a bug with a clean git status.