01 / Three-way folder comparison
See which side changed each file
A two-way comparison tells you the copies differ. Comparing with the original adds the context: which side changed, added or removed each file, and where both sides changed the same entry.
In the tutorial, one copy changes holiday days and office opening time. Sara’s copy changes the expenses limit and Wi-Fi password and adds an onboarding page. The original is the folder both copies started from.
02 / Three-way folder comparison
Combine independent edits in a new folder
Merge into a folder writes the result to a new or empty destination. The three compared folders are read without modification. Review the proposed writes before proceeding.
Text edited on different lines can merge automatically. In the demonstration, the office page keeps both the earlier opening time and Sara’s Wi-Fi change. Other conflicts are listed for review; a shared file conflict does not mean every line conflicts.
03 / Three-way folder comparison
A local alternative for the Mac
Meld offers two- and three-way comparison of files and folders. Its website says macOS is not yet officially supported and points to semi-official builds and package managers.
This guide shows Diff Anything’s independent workflow on Mac. Your files are processed on your computer and are never sent to an AI model. Diff Anything is not affiliated with Meld.
04 / Three-way folder comparison
Free preview and Pro merging
Free previews the first 100 entries in a three-way folder comparison and allows 10 new comparison sessions per local day. Pro lists all entries within technical safety limits and enables merging into a folder.
The full three-way comparison and folder merge shown in the tutorial use Pro. Keep the original and both edited copies until you have reviewed the merged result.