Resolve Git Conflicts

Resolve merge + rebase conflicts w/ safe recovery. ID conflict sources, read markers, choose resolution strategies, continue or abort safely. Use → git merge/rebase/cherry-pick/stash pop reports conflicts, git pull conflicts, safely abort + restart failed merge/rebase.

pjt222 Updated 44 repo stars

File contents

pjt222/agent-almanac commit 6c15bdd530

Frequently asked questions

npx get-skill add pjt222/resolve-git-conflicts-10