Method and apparatus for understanding and resolving conflicts in a merge

An apparatus for merging first and second computer files wherein the first and second computer files are modified versions of a common computer file, the apparatus comprising:

• means for producing a first set of stacked diffs between the first computer file and the common computer file and for producing a second set of stacked diffs between the second computer file and the common computer file;
• and
• means for simultaneously displaying the first and second sets of stacked diffs, wherein common lines of the first and second sets of stacked diffs are aligned and new lines of each of the first and second sets of stacked diffs are aligned with blank lines of the other stacked diff.

A computer readable medium including a computer program for merging first and second computer files wherein the first and second computer files are modified versions of a common computer file, the computer readable medium comprising:

• computer readable means for producing a first set of stacked diffs between the first computer file and the common computer file and for producing a second set of stacked diffs between the second computer file and the common computer file;
• and
• computer readable means for simultaneously displaying the first and second sets of stacked diffs, wherein common lines of the first and second sets of stacked diffs are aligned and new lines of each of the first and second sets of stacked diffs are aligned with blank lines of the other stacked diff.