Merge Conflict Marker Finder

How to use this developer tool

1. Paste the conflicted file text or load a local text file.
2. Adjust the available checks or parsing options.
3. Select Find Markers or press Ctrl/Cmd + Enter.
4. Review the summary, detailed output, and structured export before using the result.

What this developer tool does

Scan pasted source text for unresolved Git merge-conflict blocks. The finder tracks opening, divider, optional base, and closing markers, then reports exact line numbers and incomplete or nested structures. It is useful for a quick pre-commit check when a large resolved file still looks suspicious.

Marker-like text intentionally stored in documentation can be reported. Review the surrounding lines before deleting anything.

Example

The bundled sample demonstrates the expected input. Select Sample, run the analyzer, and compare the detailed output with the summary metrics.

const mode = "dark";
<<<<<<< HEAD
const limit = 10;
=======
const limit = 20;
>>>>>>> feature/tune-limit

Use cases

• Pre-commit and code-review checks
• Query or repository troubleshooting
• Generating copy-ready diagnostics for an issue

Tips for reliable output

• Use the exact text that the target system will receive.
• Keep dialect- or policy-specific options aligned with your project.
• Review warnings even when the main result is valid.
• Save structured JSON when another script needs the findings.
• Confirm destructive operations in the real environment separately.

Processing details

Recognizes seven-character conflict markers at the beginning of a line and validates their block order.

Marker-like text intentionally stored in documentation can be reported. Review the surrounding lines before deleting anything.