Merge Conflict Explainer

Paste a conflicted file to see every hunk split into ours vs theirs, with labels and line numbers.

Parsing is local; nothing is uploaded. No auto-merge — you keep the decision.

Paste a file with <<<<<<< markers to break each conflict into ours and theirs.

Resolving by hand

  1. Read both intents — check the surrounding code and the commit behind each side before touching anything.
  2. Combine deliberately — keep one side, weave both together, or rewrite the lines; never pick blindly.
  3. Delete every marker — no <<<<<<<, =======, or >>>>>>> line may survive in the resolved file.
  4. Re-run the tests — stage the file only after it compiles and the suite is green.