Git Advanced Merging

Use when resolving non-trivial merge conflicts, choosing a merge strategy, or undoing a merge — covers -X options, diff3 markers, strategy vs option, reset vs revert -m, and re-merging reverted branches

narenaryan Updated 0 repo stars

File contents

narenaryan/agent-skills commit a01a2c48d8

Frequently asked questions

npx get-skill add narenaryan/git-advanced-merging