Resolving Merge Conflicts

Resolve an in-progress git conflict without a silent drop. Use when the worktree is mid-merge, mid-rebase, mid-cherry-pick or mid-stash-pop: `CONFLICT (content)`, `<<<<<<<` markers, `Unmerged paths`, or `fix conflicts and then commit the result`.

bhagyamudgal Updated 2 repo stars

File contents

bhagyamudgal/skills commit 0ca0fe97ef

Frequently asked questions

npx get-skill add bhagyamudgal/resolving-merge-conflicts