Resolve Git Conflicts

Resolve merge and rebase conflicts with safe recovery strategies. Cover identifying conflict sources, reading conflict markers, choosing resolution strategies, continuing or aborting operations safely. Use when git merge, rebase, cherry-pick, or stash pop reports conflicts; when git pull results in conflicting changes; or when need to safely abort and restart failed merge or rebase operation.

pjt222 Updated 44 repo stars

File contents

pjt222/agent-almanac commit 783e75c3e9

Frequently asked questions

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