Resolve Git Conflicts

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

pjt222 Updated 44 repo stars

File contents

pjt222/agent-almanac commit dd77fb3c72

Frequently asked questions

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