Use this page to build a list of files and folders in the destination view. When the Merge Manager searches for versions that require a merge, it searches the VOBs for files and folders that appear on this list. Any file or folder on the list whose from-version (the version in the VOB) is not the same as the version selected by the destination view is a candidate for merging. By default, the from-version is the latest version on the main branch of the element in the VOB. You can specify different selection criteria for the from-version on the Specify selection criteria and merge options page of the Merge Manager.
The following controls appear in the dialog box:
Control name | Control description |
---|---|
Directories and files to be considered | Displays a list of folders in the destination view. Select a folder to include all its contents in the search for versions that require a merge. Click the plus sign (+) to the left of any folder to show its contents. |
Back | Returns to the previous step |
Next | Confirms your selections and moves on to the next step. Click Finish to use the default merge options and start searching for versions to merge. |
Finish | Confirms your selections and starts the search for versions to merge. Click Next to specify from-version selection criteria and additional merge options. |
Cancel | Cancels the operation. |