Merging Changes across Streams

Do one of the following:

In the desktop client, from the Stream menu select Merge.
In the desktop client right-click the root of a stream, or any subfolder or item, and select Merge.
In the web client select the My Current Stream tab, select a stream, and click Merge.
In Windows Explorer right-click a work area root, or any subfolder or item, and select Dimensions | Merge. In the Merge wizard select Merge streams or their folders and click Next.
(Desktop client and Windows Explorer only): open a changesets dialog box, right-click a stream version, and select Merge from Stream Version.

The Merge wizard opens.

In the Merge changes from this stream box specify a stream that will be the source for this merge. 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.

Optionally select a version of this stream on which to base the new stream and click OK.

Enter the stream ID, and optionally a version number, in this format:

PRODUCT:STREAM_NAME;VERSION

For example: QLARIUS:JAVA_BRANCHA;5

NOTE If you do not specify a stream version the changes are merged from the latest version.

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. Update your work area and deliver local changes before performing a merge.

To change the direction of the merge click Swap.

NOTE After swapping you may need to change the work area to one that is associated with the target stream.

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 restrict the scope of the merge to a specific folder and its subfolders, select Limit the scope of the merge to this folder and browse to the folder, or enter its path. If you invoked the Merge wizard from a subfolder its path is displayed.
(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.
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.