Patent ID: 6415299
Filing Date: 2002-07-02
Classification: G06F,Y10S

Abstract:
A computer-implemented method for merging a source version into a target version of a model in an object oriented repository, said method comprising the steps of:a. building a first list as a collection of versions that occur only in a history of said source version; b. building a second list as a collection of versions that occur only in a history of said target version; c. creating a dual history as a union of said first list and said second list; d. identifying said second list as non-preferred history wherein said source version is preferred; e. adding said first list to said history of said target version; f. reporting any conflicts occurring in said dual history; and, g. resolving said conflicts by adding said target version to a list of end versions on each conflicting attribute value and link occurring in said non-preferred history.