Version Control System Branching

Example 7

The version control system of any preceding example, wherein the one or more modified branches are child branches of the third branch.

The method of any preceding example, wherein assembling the first change set includes determining a current state of each database table in the first branch, wherein assembling the second change set includes determining a current state of each database table in the second branch, and wherein the determining that a direct conflict is present includes comparing the state of database tables in the first branch with the state of corresponding database tables in the second branch.