Git Resolve Conflicts

Use when resolving in-progress Git merge, rebase, cherry-pick, revert, stash, or pull conflicts; unmerged paths; conflict markers; ours/theirs choices; lockfile/generated-file conflicts; or branch integration conflicts before commit or PR work.

cipradu Updated

File contents

cipradu/Agent-Workbench commit 7f5fadd186

Frequently asked questions

npx get-skill add cipradu/git-resolve-conflicts