InstantTools.siteZero Latency Utilities
dev Tool
100% In-Memory (Zero Server Upload)

3-Way Text Merge & Conflict Resolver

Merge two edited versions against a common original, see exactly what changed on each side, and resolve conflicts one by one.

Three versions

Lines (base / A / B): 0 / 0 / 0

Merged result

Paste the base version and the two edited copies. Changes made in only one version are applied automatically; a line both versions changed differently is flagged as a conflict with three ways to resolve it.

How the merge is worked out

Each edited version is compared with the base using a longest-common-subsequence line diff (computed here in the browser, no library, no upload), which turns it into a list of changed regions. Regions from A and B that sit in the same part of the base are then compared against each other: identical edits are applied once, edits on only one side are applied automatically, and edits that disagree become conflicts for you to resolve.

Blocks are labelled in words — “from A”, “from B”, “from A and B”, “conflict” — so the meaning never depends on colour alone. The merge updates as you type; conflicts you have resolved are remembered while the page stays open, and clearing the inputs resets them.

About 3-Way Text Merge & Conflict Resolver

Combine two revisions of a document without losing track of what changed. Paste the original as the base plus version A and version B, and the tool diffs all three, applies the edits that only one side made, and flags the places where both sides changed the same lines as conflicts. Each conflict can be resolved by taking version A, version B, or both in order, and the merged result updates as you go. The output can be copied or downloaded as a text file.

Key Features & Privacy Guarantee

  • Zero server transmission: all computation happens instantly in your local browser runtime.
  • No sign-up, no subscriptions, and no usage quotas.
  • Optimized for maximum speed, accuracy, and lightweight performance.
  • Instant one-click clipboard copying.

Frequently Asked Questions

Common questions and helpful answers about this utility.

It is not. Where both versions changed the same part of the original in different ways, the tool shows the two alternatives and lets you choose one or keep both, so the decision stays with you.