Merge Conflict Resolution

Detect, classify (porcelain status; complexity: trivial, semantic, structural, delete-modify), and resolve git merge conflicts through per-file strategy selection (accept-ours, accept-theirs, manual-merge, rebase), manual conflict hunk parsing, and post-resolution verification (orphaned markers, build, tests). Use when a branch has conflicts with its merge target or when rebasing onto an updated base. This skill MUST be consulted because silently dropping changes is non-negotiable; every conflict resolution must account for both sides.

synaptiai Updated 7 repo stars

File contents

synaptiai/synapti-marketplace commit d1c2383d88

Frequently asked questions

npx get-skill add synaptiai/merge-conflict-resolution