Git Conflict Analyzer

1 conflict block(s): 1 ours line(s), 1 theirs line(s).

How it works

• Scanned each line for the conflict start (`<<<<<<<`), base (`|||||||`), separator (`=======`) and end (`>>>>>>>`) markers.
• Counted the lines on each side between the markers.
• Recorded the ours/theirs labels from the marker lines.

• Both the classic two-way markers and the diff3 form with a `|||||||` base section are recognised.
• A block must be closed by a `>>>>>>>` marker to be counted, so a truncated tail is not silently reported as resolved.

Methodology

1. Scan for the start, base, separator and end markers in order.
2. Count the lines between the ours/separator and separator/end boundaries.
3. Report each block with its start line, side sizes and labels, and a total.

Usage

1. Paste the contents of a file that has Git conflict markers.
2. Read each conflict block, its line range and its ours/theirs labels.
3. Resolve the file and re-check to confirm no markers remain.

Examples

These are examples, not current values: they use fixed inputs, while the interactive tool computes live results in your browser.

One two-way conflict

{
  "text": "line one\n<<<<<<< HEAD\nours\n=======\ntheirs\n>>>>>>> feature\ndone\n"
}

diff3 conflict with a base

{
  "text": "<<<<<<< HEAD\na\n||||||| base\nb\n=======\nc\n>>>>>>> other\n"
}

No conflict

{
  "text": "plain text\nwithout markers\n"
}

Limitations

Reading a conflict block

A conflict is marked with `<<<<<<<` (start, labelled with your side), `=======` (separator) and `>>>>>>>` (end, labelled with theirs). The diff3 style inserts a `|||||||` base section between your side and the separator.

The analyzer counts each side so you can see how large each conflict is. Committing while any marker remains is the usual failure mode; re-running the tool is a quick check that the file is clean.