NOTE Not available in the web client.
In the desktop client do one of the following:
Right-click a stream. In the Merge wizard select Merge change requests from another stream and click Next.
Select one or more change requests, right-click, and select Merge.
The Merge Request wizard opens.
The Merge changes from the request(s) box displays the selected requests. To specify different requests, click Select and use the Request Selection wizard to choose requests. To add change requests manually, enter their IDs separated by a comma.
NOTE You cannot merge request changes from different streams in the same merge operation.
If the requests belong to the same stream, the Include changes from this stream box displays the stream ID. To select a different stream do one of the following:
Click Select and select one of the options in the Select Stream dialog box. If you select Another stream do one of the following:
• Start typing the ID of a stream. Streams that contain any characters in the string are displayed. For example, to find ’QLARIUS:VS_BRANCHA’ type ’vs’.
• Select a stream from the list. Favorite streams and recently used streams are displayed at the top.
Click OK.
Enter the stream ID in this format: PRODUCT:STREAM_NAME
For example: QLARIUS:JAVA_BRANCHA
NOTE You can only merge from the latest version of 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 Swap.
In the Merge using this work area box select the work area where the merge will be performed or enter its path.
To interactively review the merge results before applying them to the work area, select Perform an interactive merge.
To merge all items that are related to child requests of the selected change requests, 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 changes associated with the request(s) that you specified will be merged. To merge all changes unselect Cherrypick file changes. For more details about cherrypicking 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.
(Web client only) To log the merge operation select Enable logging and enter the path where the log file will be saved, or click Browse and select a folder.
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 you deselected interactive merge and there are no conflicts the merge completes successfully. If there are conflicts, or you selected interactive merge, the Review Changes page is displayed. 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, see Delivering Changes from a Work Area to a Stream.
Related Topics
Merging Changes across Streams