Resolve Conflicts

Resolve an in-progress merge/rebase/cherry-pick conflict by recovering both sides' intent from history before touching any hunk, composing both changes wherever possible, then sweeping for semantic conflicts the markers don't show. Use when: 'resolve conflicts', 'merge conflict', 'rebase stopped', 'CONFLICT (content)', git status shows unmerged paths, not for choosing merge vs rebase or PR lifecycle (use /pull-request), and not for ordinary commits (use /commit).

melodic-software Updated 30 repo stars

File contents

melodic-software/claude-code-plugins commit 762fcf8177

Frequently asked questions

npx get-skill add melodic-software/resolve-conflicts