Merging Algorithms

Back to Computer-Science-Concepts

Two way merges will result in manually selecting between two diffs. A three way merge uses the nearest common ancestor of two files as a third point of reference to determine who changes what in the file. For three way merge, the only manual intervention needed is if both developers changed the same line.