Integration

Start Menu Path: Module Menu  / Configuration Mgt / Integration

Function:  Integration provides a merge method to pull changes from one stream into another stream. This provides a strong structure merge facility that is recommended for most merge events. It is implemented as a three way merge using the common parent from the branches to assess the differences. See also Merge Concepts.

If the "Integration" is started from a module that already has an active Integration, then the integration is resumed. Otherwise a new integration is started.

Starting an Integration

An Integration is initiated from the target module, i.e. the module that shall receive the changes. By selecting integration, the user is presented the option to configure the merge event with the following GUI: 

The options are as follows:

Integration Parameters

When starting an integration, the user will also have the option to select the changes that should be considered for the integration. It might, for example, not be desired to integrate hierarchy changes to the objects or links or certain attributes in all cases.

Executing the Integration

The merge is directed via the Integration GUI: 



Additionally, in the target module (i.e. the module from which the integration was started) an Integration view is created that shows the information about the changes in different columns. Using this view, changes can be viewed in the context of the surrounding requirements. It is therefore advised to have the target module and the Integration GUI side by side during the integration. A second monitor is very helpful in organizing the overview during integration.

The GUI consists of the following elements: