Agent Skills: merge-conflict-resolution
Use when git merge or rebase fails with conflicts, you see 'unmerged paths' or conflict markers (<<<<<<< =======), or need help resolving conflicted files
developmentID: axiomantic/spellbook/merge-conflict-resolution
Install this agent skill to your local
Skill Files
Browse the full folder contents for merge-conflict-resolution.
Loading file tree…
Select a file to preview its contents.