Git Merge Conflict Resolver

Runs in your browser — nothing is uploaded

Paste file with conflict markers

About this tool

Everything happens in your browser — paste a file's contents (with its <<<<<<< conflict markers), nothing is uploaded. If your conflict includes a common-ancestor section (diff3 style, |||||||), it's parsed but not shown — only "ours" and "theirs" are used for resolution.

Frequently asked questions

What is Git Merge Conflict Resolver?

Visualize and help resolve merge conflicts. It is one of the Git Tools tools on MyCodeTips.

How do I use Git Merge Conflict Resolver?

Open the tool, enter or paste your input, and the result appears right away. Use the Copy button to copy it.

Is Git Merge Conflict Resolver free to use?

Yes. It is free to use and does not need an account.

Is my data safe with Git Merge Conflict Resolver?

Yes. It runs entirely in your browser, so what you enter is never uploaded to our servers.

Can I share my result?

Yes. Use the share buttons below the tool to post a link or copy a link to the tool page.