Debug & Review · LOCAL TOOL

Merge Conflict Marker Review

Inspect pasted text for Git-style start, optional base, separator, and end markers. Report closed blocks, their line ranges, and incomplete or out-of-order marker sequences.

Runs in this page
No API call

WORKSPACEINPUT → RESULT

Your input

LOCAL

Result

Run the tool to see a result.

Your result will appear here. Input is not saved.

Browser-side processingNothing is sent to a tool API.

WHY THIS TOOL EXISTS

A focused job, not a black box.

This is a review checklist for conflict remnants, including diff3-style base markers. It keeps branch labels and content line counts available so a reviewer can jump to the right source section.

How to use it

Paste the file text or conflict excerpt.
Review block ranges and malformed marker issues.
Resolve each block in the source editor and rerun the check.

TRY A WORKING EXAMPLE

Start with known input.

Load this sample into the workspace, run the tool, and compare the result shown below.

Show sample input

{
  "source": "before\n<<<<<<< main\nconst count = 1;\n=======\nconst count = 2;\n>>>>>>> feature\nafter"
}

Expected sample result from the local tool

1 closed conflict block(s) · 0 marker issue(s).

{
  "blocks": [
    {
      "start": 2,
      "markerWidth": 7,
      "ours": "main",
      "base": null,
      "separator": 4,
      "end": 6,
      "theirs": "feature",
      "oursLines": 1,
      "theirsLines": 1
    }
  ],
  "issues": []
}

Text marker inspection only. The tool does not choose a branch, merge code, or prove that code is conflict-free.

LIMITS AND INTERPRETATION

What the result cannot tell you.

Recognizes whole-line markers of at least seven repeated characters and optional labels. It does not merge code or detect semantic conflicts. Marker-like literal text can require manual interpretation.

Inputs are processed in this page and are not written to local storage.