Patent ID: 11875149
Assignee: CROSSVISTA, INC.
Field: Computer technology (Electrical engineering)
Classification: CPC G | IPC G

Claim 0:
1. A method, comprising:
assembling a first and second change set defining changes made to objects of corresponding first and second branches respectively of a version control system using at least one running process executing on one or more processors of one or more computers, wherein the at least one running process is responsive to changes made to objects in the first and second branches;
assembling first and second change set dependencies for objects in the first and second change sets, the first and second change set dependencies defining dependent objects that the objects in the first and second change sets are dependent on;
determining a direct conflict when there is a first change to an object in the first change set, and a second different change to the same object in the second change set; and
determining an indirect conflict for those objects having at least one dependency in both the first and second change set dependencies or for those objects having at least one dependent object in the first change set dependency that is also in the second change set;
integrating the first and second change sets according to integration rules that automatically reconcile database changes in the first change set with different database changes in the second change set;
wherein the objects of the first and second branches include database objects defining aspects of a database that are managed by the version control system;
wherein determining that a direct or indirect conflict exists includes comparing database table objects in the first branch with corresponding database table objects in the second branch;
wherein the first and second change sets includes determining changes to a data structure of the respective databases of the first and second branches, and wherein integrating the first and second change sets includes changing the data structure of the first and second databases accordingly to synchronize the data structure in the database of the first and second branches;
wherein the changes to the data structure includes determining that a first table is added in the first change set, and a second table is added in the second change set; and
wherein the first table and the second table have matching names, and wherein the first table and the second table contain at least one record with a primary key that is common to both tables, and wherein data in the at least one record of the first table does not match data in the at least one record of the second table.