~ / leaderboard / skill / merge-conflict
Skill · #4756

merge-conflict

Resolve Git merge, rebase, cherry-pick, revert, and stash conflicts safely by understanding both sides and the operation in progress before integrating, then verifying the result builds and passes tes

4rigs use it
0%of all rigs
14.7kavg rig context tax

Get it

$ npx degit moah0911/aftermath/skills/merge-conflict .claude/skills/merge-conflict

From the most-starred rig that ships it: moah0911/aftermath. Same-named skills in different rigs may differ — review before use.

Often used together with

Rigs using merge-conflict (4)

copied ✓