Merge Conflict

Resolve Git merge, rebase, cherry-pick, revert, and stash conflicts safely by understanding both sides and the operation in progress before integrating, then verifying the result builds and passes tests. Use when a merge/rebase/cherry-pick stops with conflicts or "needs merge".

KhaledSaeed18 Updated 5 repo stars
dotclaude

File contents

KhaledSaeed18/dotclaude commit 58cf8b52a0

Frequently asked questions

npx get-skill add khaledsaeed18/merge-conflict