Quick Merge

Start Menu Path: Module Menu / Configuration Mgt / Quick Merge

Function: Quick Merge provides a push method to copy objects / attribute values / links to one or more branches at the same time. The quick merge is designed for working dynamically on a module while pushing the changes, so it is very well suited for bug fixes and general house keeping actions to keep multiple branches in sync. Note that the whole point of Branching and Merging is to clearly manage the parts of branches that are in sync with each other and the parts that are different from each other. The quick merge is therefore the tool to use to make sure that the relevant parts of branches are really in sync.

Configuring a Quick Merge

The Quick merge is started from the module that contains the changes or the master state that shall be applied to other branches. After starting the Quick Merge the following GUI is presented to the user: 

Viewing the differences

The changes between branches are shown similar to the compare screens. New columns will be added for each branch added as a target for the quick merge. The user can review these differences by browsing the module.