How to use Three-Way Merge Resolver
- Paste the common base and the left and right versions derived from it.
- Run the merge and inspect any LEFT, BASE and RIGHT conflict blocks. Independent edits are kept automatically.
- To resolve a conflict, use the CSV headers conflict,choice. Copy the complete conflict ID from the report into its first column and enter left, right or base in the second. Keep the three input texts unchanged.
- Run again to apply the reviewed choices. Download merged.txt when resolved, or merged-with-conflicts.txt when markers remain, and inspect the text before replacing a file.
Example: Three-Way Merge Resolver
Merge independent edits and review overlapping line conflicts.
Supported inputs and limits
- Each version is limited to 256 KiB and 2,000 lines.
- Difference search is bounded by 800 changed lines and a 250 ms per-side diff timeout; at most 400 edit regions are merged.
- Independent line edits are retained.
- Overlapping unequal edits remain visible until reviewed.
- The merge is line-based, not syntax-aware, and does not prove that a merged program compiles.
More details
Empty versions and CRLF bytes are supported.
Conflict IDs apply only to unchanged inputs.
Where your input is processed
This tool does not upload your inputs. See the limits for anything saved on your device.
Questions about Three-Way Merge Resolver
What is the common base for?
It lets the merge distinguish a change made on only one side from an overlapping edit made on both sides. Comparing left and right alone cannot make that distinction.
Will the tool silently choose one conflicting side?
An unresolved conflict is exported with visible LEFT, BASE and RIGHT markers. Enter a reviewed conflict choice only when you have decided which text to retain.
Can I merge source code safely?
The output is text. Independent line changes can combine into syntactically invalid or semantically inconsistent code, so run the appropriate compiler and tests afterward.