Method and System for Providing a Representation of Merge Conflicts in a Three-Way Merge Operation
First Claim
1. A system, comprising:
- a set of documents including at least a first, second, and third documents, each of the documents having common text and at least two of the documents having different text; and
a programmed application configured to generate a merged document that includes the common text and indicators of the different text between any of the at least first, second, and third documents.
1 Assignment
0 Petitions
Accused Products
Abstract
A method and system provides an improved representation of merge conflicts in a three-way merge operation of three sequences: Original, Version1, and Version2. A merge program first compares the three sequences to identify a list of difference chunks of elements between the Original and Version1, and a list of difference chunks between the Original and Version2. From the two sets of difference chunks, the merge program creates an annotated list of chunks. Each chunk in the annotated list is identified by a conflict flag that indicates whether the chunk is a part of a conflict and if it is, what sequence(s) being merged it belongs to. A merged document is then constructed based on the annotated list of chunks, with the chunks identified in the merged document with conflict markers for viewing by a user.
51 Citations
20 Claims
-
1. A system, comprising:
-
a set of documents including at least a first, second, and third documents, each of the documents having common text and at least two of the documents having different text; and
a programmed application configured to generate a merged document that includes the common text and indicators of the different text between any of the at least first, second, and third documents. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8, 9)
-
-
10. A method, comprising:
-
determining common text in a set of documents that include at least a first, second, and third document;
determining different text between at least two of the documents; and
generating a merged document that includes the common text and indicators of the different text between any of the at least first, second, and third documents. - View Dependent Claims (11, 12, 13, 14, 15, 16, 17, 18, 19)
-
-
20. One or more computer readable media comprising computer executable instructions that, when executed, direct a computing-based device to:
-
determine common text in a set of documents that include at least a first, second, and third document;
determine different text between at least two of the documents;
generate a merged document that includes the common text and indicators of the different text between any of the least first, second, and third documents; and
automatically resolve conflicts of the different text between any of the at least first, second, and third documents.
-
Specification