Merge conflict locator
Locate Git merge marker blocks and count current and incoming lines. It does not resolve conflicts automatically and rejects malformed marker order.
The example value has been entered. Check it immediately or change the value.
Input is processed in the browser. Refreshing returns a sample value.
Instructions and example
Track start, optional base, separator and end marker states, retaining physical line numbers.
The default conflict spans lines 2–6, with 1 current line and 1 incoming line.
Supports default 7-character Git markers and diff3 base sections. Custom marker lengths and contextual string detection are excluded.
Frequently asked questions
Is a conflict base section included in current-line counts?
No. The diff3 base section is excluded from current and incoming counts.
What if documentation contains marker-like strings?
No context inference is performed; inspect reported positions to determine whether they are real conflicts.
Calculation criteria and reference materials
- Git — Diff format
Track start, optional base, separator and end marker states, retaining physical line numbers.
Verification of calculation criteria: · Calculation·verification principles · Report errors