×

Method and apparatus for understanding and resolving conflicts in a merge

  • US 20040177343A1
  • Filed: 11/03/2003
  • Published: 09/09/2004
  • Est. Priority Date: 11/04/2002
  • Status: Abandoned Application
First Claim
Patent Images

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 all claims
  • 1 Assignment
Timeline View
Assignment View
    ×
    ×