← All tools

Merge Conflict Resolver

Paste a file that still has Git conflict markers, choose ours, theirs, both or the base for each conflict, and copy the merged text back.

Markers must start a line: 7 < for ours, optional 7 | plus a base section (diff3 or zdiff3), 7 = then 7 > for theirs. Everything else is kept byte for byte.

The tool parses the marker lines the way Git writes them, reports the conflicting line ranges and any malformed block instead of guessing, and replaces each block with the version you choose. Ours comes first in both-version output. Base needs a diff3-style ||||||| section; without one the option is not offered. Nested conflicts are not supported because Git does not produce them. Nothing is uploaded or stored, and the page never contacts the network.