Skill

resolve-merge-conflicts

Resolve an in-progress git merge or rebase conflict SAFELY — understand BOTH sides' intent before you resolve, never blind-accept `--theirs`/`--ours`. Use when 'merge conflict', 'rebase conflict', 'CONFLICT (content)', 'fix the conflicts', 'resolve the conflicts', 'accept incoming vs current', git h

Claim this listing

Connect your GitHub to prove you own or maintain this listing. We verify repo access automatically — most publishers are confirmed in seconds.

1Connect GitHub

2Submit your claim

3Auto-verified, or reviewed within 48h