sk Skill · axiomantic
resolving-merge-conflicts
Use when git merge or rebase fails with conflicts, you see 'unmerged paths' or conflict markers (<<<<<<< =======), or need help resolving conflicted files. Triggers: 'merge conflict', 'fix the conflicts', 'conflicting changes', 'resolve conflicts', 'can't merge'.
Open on skills.sh ↗read 2026-09-18
- installs 8w
- 0
- 30-day movement
- starts with the next reading
- Related entries
- 9
- Connections
- 0
javascriptPython
- Host repository
- axiomantic/spellbook
- Version
- 1.1.0
- Host stars
- 10
- Host language
- Python