Data processing: software development – installation – and managem – Software program development tool – Translation of code
Reexamination Certificate
2007-10-30
2007-10-30
Dam, Tuan (Department: 2192)
Data processing: software development, installation, and managem
Software program development tool
Translation of code
C715S252000, C715S252000
Reexamination Certificate
active
10440339
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.
REFERENCES:
patent: 4445795 (1984-05-01), Levine et al.
patent: 4674040 (1987-06-01), Barker et al.
patent: 5828885 (1998-10-01), Raman
patent: 6016494 (2000-01-01), Isensee et al.
patent: 6061698 (2000-05-01), Chadha et al.
patent: 6438543 (2002-08-01), Kazi et al.
patent: 6507856 (2003-01-01), Chen et al.
patent: 2003/0212712 (2003-11-01), Gu et al.
patent: 2004/0177343 (2004-09-01), McVoy et al.
patent: 2004/0205539 (2004-10-01), Mak et al.
Tang, Xiaoping, Tia, Ruiqi, and Wong, D.F., “Fast Evaluation of Sequence Pair in Block Placement by Longest Common Subsequence Computation Computation”, Dec. 2001, IEEE, vol. 20, No. 12, pp. 1406-1413.
Myers, “An O(ND) Difference Algorithm and Its Variations,”Algorithmica #21986, 15 pages.
Chou Andrew Y
Dam Tuan
LandOfFree
Method and system for providing a representation of merge... does not yet have a rating. At this time, there are no reviews or comments for this patent.
If you have personal experience with Method and system for providing a representation of merge..., we encourage you to share that experience with our LandOfFree.com community. Your opinion is very important and Method and system for providing a representation of merge... will most certainly appreciate the feedback.
Profile ID: LFUS-PAI-O-3893674