Conservative Three-way Text Merge

How to use Conservative Three-way Text Merge

Combine independently edited copies of one text while keeping the common ancestor visible. Unilateral changes and identical branch results can be retained automatically. Conflicting or touching change regions stay unresolved until you explicitly choose a source or enter your own replacement text.

1. Paste the common original and the two complete revisions, preserving the intended line endings.
2. Run JSON review and supply explicit choices for each current conflict ID when needed.
3. Review the complete merged content and hashes, then export TEXT only after ready is true.

Good to know

• Each source has at most 20,000 characters and 400 LF-delimited/final-incomplete line tokens. Two bounded longest-common-subsequence tables determine deterministic base-relative edits; tie choices prefer base deletion. Unicode text is never executed or syntax-checked.
• Changes whose closed base boundaries touch are grouped conservatively. Some adjacent independent edits can therefore require manual review. This is an explicit custom policy, not GNU diff3, Git or a semantic code-merge compatibility promise.
• At most 400 unique current conflict decisions: left, right, base or custom. Custom text has at most 20,000 characters and the complete merged result has a 60,000-character cap. JSON can show unresolved work; TEXT export requires every conflict resolved and never fabricates a partial merged file or conflict markers.
• Line tokens retain CR characters, BOM and final incomplete-line text. Downloaded text preserves the selected tokens, while browser textareas and clipboard software can normalize line endings. Source hashes and conflict excerpts can contain private wording; no history is saved automatically.
• Processing is local. Output is limited to 1,000,000 text characters unless a stricter file limit is stated.