Skip to main content

Merge Conflict Resolver

v1.0.3

Generate merge conflict resolution templates and command helpers.

Generates merge conflict resolution templates and git command helpers — shows the correct rebase/merge commands and explains conflict marker (<<<, ===, >>>) syntax for clear resolution.

How to use
  • →Select conflict scenario (merge, rebase, cherry-pick) to see the correct resolution commands.
  • →The conflict marker guide explains what each section (ours, theirs) represents.
  • →Use git checkout --ours or --theirs for whole-file conflicts.

Paste the raw conflict section from your file including the <<<<<<<, =======, and >>>>>>> markers.

HEAD (ours)
const mode = 'strict';
Incoming (theirs)
const mode = 'legacy';
Resolved Output
// RESOLVED — keeping HEAD (ours)

const mode = 'strict';