Method and apparatus for understanding and resolving conflicts in a merge
First Claim
1. A method of merging first and second computer files wherein the first and second computer files are modified versions of a common computer file, the method comprising the steps of:
- producing a first set of stacked diffs between the first computer file and the common computer file;
producing a second set of stacked diffs between the second computer file and the common computer file; and
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.
1 Assignment
0 Petitions
Accused Products
Abstract
A method is provided for merging first and second computer files wherein the first and second computer files are modified versions of a common computer file. The method comprises the steps of producing a first set of stacked diffs between the first computer file and the common computer file, producing a second set of stacked diffs between the second computer file and the common computer file, and 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. Apparatus for performing the method and a computer readable medium including a computer program for performing the method are also included.
115 Citations
21 Claims
-
1. A method of merging first and second computer files wherein the first and second computer files are modified versions of a common computer file, the method comprising the steps of:
-
producing a first set of stacked diffs between the first computer file and the common computer file;
producing a second set of stacked diffs between the second computer file and the common computer file; and
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. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)
-
-
15. 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. - View Dependent Claims (16, 17, 18, 19)
-
-
20. 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. - View Dependent Claims (21)
-
Specification