Merge Conflict Resolver
Resolve Git merge conflict markers in a pasted file — each <<<<<<< / ======= / >>>>>>> block listed, ours, theirs, both or base per conflict, text merged.
Each conflict with both (or three) sides and line numbers, the merged file with the chosen resolutions and no markers, counts of resolved and remaining conflicts, and trivial (whitespace-only) conflicts flagged.
Example: A file with two conflicts and the choices 1:both, 2:theirs comes back with conflict 1 keeping both sides in order and conflict 2 the incoming lines; a diff3 ||||||| base section can be chosen too.
Markers in,
a decision per block out.
How the conflict blocks are read, what each strategy does, and what the page will not decide for you.
Reading the markers
Git writes a conflict as <<<<<<< ours-label, the lines from your side, =======, the lines from the incoming side, and >>>>>>> theirs-label; with merge.conflictStyle diff3 or zdiff3 a ||||||| base section between them shows the common ancestor. The page scans line by line, records each block’s line range, both (or three) sides and labels, flags a block whose sides differ only in whitespace as trivial, and reports an unclosed or nested block with its line number. Everything outside the blocks passes through untouched, CRLF included.
Strategies
ours keeps the first side, theirs the second, both keeps ours then theirs, both-reverse the other way round, base restores the ancestor text (diff3 only), delete removes the block, and keep leaves the markers in place. Choices are per conflict number (1:ours, 3:theirs) and the default applies to the rest; the counts show how many blocks are resolved and how many are still marked.
What it will not do
It does not merge inside a block — a resolution that needs a line from each side, or a new line altogether, is yours to write after choosing both. It does not know the language, so a merged file can be syntactically wrong; read it once more before committing. Nothing leaves the browser; the same four anonymous usage counts as the rest of the site apply.
SOURCES
- Git conflict marker format (git merge, merge.conflictStyle diff3 / zdiff3): <<<<<<< ours, ||||||| base, =======, >>>>>>> theirs; the resolution is your choice per conflict
Last reviewed 21 September 2026. How results are checked: How we verify.