01 / Three-way text merge
Keep the changes that work together
In the tutorial, you and Sara each edited a team offsite plan. Your copy changes the start time; Sara’s changes lunch. Those independent changes merge automatically.
Both copies also change the packing line, but different words: one adds a charger, the other changes the jacket. Both edits fit in the result. Competing changes to dinner stay as a conflict for you to decide.
02 / Three-way text merge
Choose a side or edit the result yourself
At the top, each version is compared with the original. Below is the editable result. For each conflict, accept ours, accept theirs, keep both in either order or use the base.
The tutorial accepts Sara’s dinner time. Replace right with merged result puts the resolved text in the right-hand copy; saving writes that file. Keep the original and both copies until you have checked the saved result.
03 / Three-way text merge
A file merge directly on your Mac
KDiff3 compares and merges two or three text files or folders. KDE lists macOS and Windows builds alongside Linux. This guide demonstrates Diff Anything’s own file-merge workflow on Mac.
This workflow starts in the app and does not need Git or a command line. If a Git merge has stopped with conflicts, use the separate git mergetool guide linked below. Diff Anything is not affiliated with KDiff3 or KDE.
Resolve a Git conflict with git mergetool →
04 / Three-way text merge
Three-way merging requires Pro
Three-way merge is part of Advanced tools in Diff Anything Pro. The demonstration uses Pro to merge the files and resolve the conflict.
A Free text comparison allows files up to 5 MB each and 10 new comparison sessions per local day. Comparing two files shows their differences; the three-way merge workflow shown here requires Pro.