Select Elements for Merging

On this page, you select files, folders, or activities in the destination view to build a list of elements to be considered for merging.

Use this page to build a list of elements 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.

Controls in the dialog box

The following controls appear in the dialog box:

Control name Control description
Select elements to consider for merge Select this option to specify files or folders to be considered for merging. When you select this option, a list box appears of directories and files to be considered.
Select activities to consider for merge Select this option to specify the change set of an activity to be considered for merging. When you select this option, a list box appears of activities to be considered.

List box of 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.

List box of activities to be considered

Displays activities to be considered for merging in a table containing the Activity ID and Headline columns.
Browse Click to specify activities to be considered for merging. When you click this option, the Select the activities dialog box appears. The Select the activitiesdialog box shows the list of views and servers in the left-hand navigation pane. You can select activities in this dialog box by expanding the My Activities node for a view or by expanding the server node and selecting the activity from a stream node. Use the Add button to place the currently selected activity into the Activities selected to be used for Merge Search list box. Use the Remove button to remove the currently selected activity from the Activities selected to be used for Merge Search list box. Click OK to dismiss the Select the activities dialog box and to add the selected activities to the Activities to be considered table on the Select elements or activities for merging page. Note that you can also select activities that you do not own.
Remove Click to remove the currently selected activity from the Activities to be considered table.
Enter an activity selector You can specify an activity selector in this field by entering text in the following form:

activity:<activity_name>@/<pvob_name>

Activity selectors you enter must be in a valid format or an error message appears when you click Add.

Add After you specify an activity selector in the Enter an activity selector field, click this option to add the activity selector to the Activities to be considered table. This option becomes active when you specify an activity in the Enter an activity selector field.
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.