Resolve Conflicts

Resolve git conflicts from any operation (merge, rebase, cherry-pick, stash, revert). Use when encountering conflicted files during git operations.

nielsmadan Updated 1 repo stars

File contents

nielsmadan/skills commit 9664bec20e

Frequently asked questions

npx get-skill add nielsmadan/resolve-conflicts