The patent badge is an abbreviated version of the USPTO patent document. The patent badge does contain a link to the full patent document.
The patent badge is an abbreviated version of the USPTO patent document. The patent badge covers the following: Patent number, Date patent was issued, Date patent was filed, Title of the patent, Applicant, Inventor, Assignee, Attorney firm, Primary examiner, Assistant examiner, CPCs, and Abstract. The patent badge does contain a link to the full patent document (in Adobe Acrobat format, aka pdf). To download or print any patent click here.
Patent No.:
Date of Patent:
Oct. 30, 2007
Filed:
May. 16, 2003
Artem Y. Livshits, Bellevue, WA (US);
Artem Y. Livshits, Bellevue, WA (US);
Microsoft Corporation, Redmond, WA (US);
Abstract
A method and system provides an improved representation of merge conflicts in a three-way merge operation of three sequences: Original, Version, and Version. A merge program first compares the three sequences to identify a list of difference chunks of elements between the Original and Version, and a list of difference chunks between the Original and Version. 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.