In the Requests view select one or more change requests, right-click, and select Merge from Request. The Merge Streams wizard opens.
The Merge changes from this request box displays the selected change requests. To add change requests enter their IDs, each separated by a comma. To specify different change requests click Select and use the Request Selection wizard to specify a product and change requests.
NOTE You cannot merge request changes from different streams in the same merge operation.
The Include changes from this stream box displays the stream that contains the change requests. To select a different stream click Select and navigate to the stream.
The Merge changes into this target stream box displays the name of the stream from which you invoked the merge. To select a different target stream enter its name or click Select and choose a stream.
NOTE You can only merge into the latest version of the target stream.
To change the direction of the merge click the Swap button.
The default project work area is displayed in the Merge using this work area box. To use a different work area enter its path or click Select and browse for one.
To interactively (manually) verify the merge results before applying them to the work area, select Perform an interactive merge.
To include all items in the merge that are related to child requests of the selected change request, select Also include items related to child requests.
(Optional) Click Advanced.
To restrict the merge to particular files or folders enter wildcard filters in:
The Include repository file box to only include specific file types.
The Exclude repository file box to exclude specific file types.
For details see Using Wildcards to Include and Exclude Files and Folders.
To apply the repository date and time to the files in the merge select Apply repository date and time.
By default only the file changes associated with the request that you specified will be merged. To merge all changes unselect Cherrypick file changes. For more details see Merging Specific Changes between Streams.
To automatically merge files whose content does not conflict, select Auto merge non-conflicting file content. In the desktop client and Windows Explorer integration you can also select a default character set that is used to transcode Unicode files before merging.
To merge do one of the following:
If you are performing an automatic non-interactive merge click Merge.
If you are performing a manual interactive merge click Next.
If there are no conflicts the merge completes successfully. If there are conflicts, the Review Changes page is displayed. Do the following:
Review the list of conflicts and select a resolution for each one.
Click Merge.
After the merge has completed successfully you are prompted to deliver the files to the repository.