Specify selection criteria and merge options
On this page, you specify criteria for selecting the from-version (the version in the VOB) to consider. You can also specify other merge options.
Use this page to specify how the merge manager should select candidates (from-versions) to consider for merging to the versions in the target view. You can select based on branch type, label type, or version selector.
Controls in the dialog box
The following controls appear in the dialog box:
Control name | Control description |
---|---|
Select latest from branch | By default, the main branch is used. To select a different branch, click Choose to open the Select Branch Type dialog box and browse the list of available branch types. |
Select based on label | Enter the name of a label type to use, or click Choose to open the Select Label Type dialog box and browse the list of available label types. |
Advanced version selector | Enter a version selector. |
Consider all the elements that it catalogs | Select to specify that the search operation considers all directory elements. This option is on by default. |
Consider all the elements, but do not recursively descend into subdirectories | Select to specify that the search operation considers all directory elements including children, but does not consider subdirectories. This option is off by default. |
Consider only the directory itself, do not merge any files | Select to specify that the search operation considers only those directories you have specified and does not merge files. This option is off by default. |
Follow VOB symbolic links | Select to allow consideration of the targets of VOB symbolic links for the merge. Clear to remove symbolic links from consideration. |
After the search, immediately start and continue merging until all the merging is complete | Select to specify that the merge operation happens automatically after performing the search and continues until the merge is complete. Clear to specify a manual merge operation after performing the search. This option is on by default. |
Automatically merge directories if possible | Select to specify that directories are merged automatically and the user does not receive notification that directories have been merged. Clear to specify a manual merge for directories. This option is on by default. |
Automatically merge files if possible | Select to specify that files are merged automatically and the user does not receive notification that files have been merged. Clear to specify a manual merge for files. This option is on by default. |
For Logical Model integrations, perform merges automatically if possible | Select to specify that elements are merged automatically for Logical Model integrations and the user does not receive notification that files or directories have been merged. Clear to specify a manual merge for Logical Model elements. This option is on by default. |
Back | Returns to the previous step |
Finish | Confirms your selections and starts the search for versions to merge. |
Cancel | Cancels the operation. |