The screenshot below shows a three-way file comparison in Merge Professional.
-
Three-way file merging is frequently used to merge two derived files into a common ancestor or base version. For more information, see Three-Way File Comparisons.
-
The need to do this typically arises when more than one person is working simultaneously on a set of source files stored in a version control or configuration management system.
-
Merge integrates with a number of such configuration management systems. Find out more.
-
Three-way file comparisons can be launched directly from a three-way folder comparison, allowing efficient integration of entire branches of source code.
-
Merge Professional also supports Automatic File Merging, to speed up three-way merges.
Please note that three-way comparison and merging capability is available only in the Professional Edition of Merge.
To continue browsing, please see Overview of Merge for Mac OS X or one of the related topics below.