Patent ID: 6226652
Filing Date: 2001-05-01
Classification: G06F,Y10S

Abstract:
A method of merging a plurality of various versions of a set of computer files, comprising the steps of:detecting a collision between the data contained in computer files in the plurality of various versions of the set of computer files;automatically loading each of the plurality of various versions of the set of computer files for which a collision was detected into a collision handler, without user intervention and in response to the detection of a collision between computer files in the plurality of various versions of the set of computer files;displaying data from said versions for which a collision was detected with said collision handler so as to highlight the differences between the data of said versions by concurrently displaying the data of the plurality of versions of a set of computer files;resolving a first difference between said versions by accepting a graphical selection of a preferred one of said displayed data from said versions; thenautomatically displaying a next difference after the first difference is resolved so as to allow the user to graphically select a preferred one of the displayed data from the versions corresponding to the next difference; andstoring a version of the loaded computer files having the differences resolved as selected by the user.