ConflictFormatter

Ever had a nasty merge conflict in your code?

Most major version control systems like Git allow to enable a conflict style, where you can see both conflicting versions as well as their common base version. This is called diff3.

But even then, it can be quite tedious to find out, what exactly was changed in the two conflicting commits. Usually, one ends up comparing the three versions manually. This tool takes a diff3-style conflict as input and outputs the two underlying conflicting diffs. Hopefully, this solves a few headaches for you.

Just paste your code in this textarea!
<<<<<<< HEAD
This tool will extract two diffs per conflict and format it.
||||||| merged common ancestors
This tool will extract two diffs from the input and format it.
=======
This tool will extract two diffs from the input and will format it.
>>>>>>>

Take this as an example:
<<<<<<< HEAD
function binary_search(a, value, low, high) {
  if (high < low) { return null; }

var mid = Math.floor((low + high) / 2);

if (a[mid] > value) {
    return binary_search(a, value, low, mid - 1);
  }
  if (a[mid] < value) {
    return binary_search(a, value, mid + 1, high);
  }
  return mid;
}
||||||| merged common ancestors
function binary_search(a, value, lo, hi) {
  if (hi < lo) { return null; }

var mid = Math.floor((lo + hi) / 2);

if (a[mid] > value) {
    return binary_search(a, value, lo, mid - 1);
  }
  if (a[mid] < value) {
    return binary_search(a, value, mid + 1, hi);
  }
  return mid;
}
=======
class Searcher {
  binary_search(a, value, lo, hi) {
    if (hi < lo) { return null; }

var mid = Math.floor((lo + hi) / 2);

if (a[mid] > value) {
      return binary_search(a, value, lo, mid - 1);
    }
    if (a[mid] < value) {
      return binary_search(a, value, mid + 1, hi);
    }
    return mid;
  }
}
>>>>>>>

<<<<<<< HEAD
You can even paste an entire file with one or multiple conflicts in it.
||||||| merged common ancestors
You can even paste an entire file.
=======
You can even paste an entire file with multiple conflicts in it.
>>>>>>>

It seems as if your code conflicts are not shown in diff3 style. This tool is more useful, if you enable this. For Git execute:

      git config --global merge.conflictstyle diff3