Merge Streams

Merge changes from this stream

Specify the stream that will be the source for this merge. Do one of the following:

• Click Select and select an option 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

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

Merge changes into this target stream

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.

• You can only merge into the latest version of the target stream.

• To change the direction of the merge click Swap. After swapping you may need to change the work area to one that is associated with the target stream.

Merge using this work area

Select the work area where the merge will be performed or enter its path.

Perform an interactive merge

Interactively review the merge results before applying them to the work area.

Limit the scope of the merge to this folder

Restrict the scope of the merge to a specific folder and its subfolders. Browse to a folder or enter its path.

If you invoked the Merge wizard from a subfolder its path is displayed.

Advanced

Click to display more options.

Include repository file

Enter an expression to only include specific file types in the merge.

• * is a wildcard character that matches any number of characters.

• ? matches any single character.

• | joins or concatenates multiple expressions.

• \ is a separator for folders and directories (Windows and UNIX).

Exclude repository file

Enter an expression to exclude specific file types from the merge

See above

Apply repository date and time

Apply the repository date and time to the files in the work area.

Auto merge non-conflicting file content

Automatically merge files whose content does not conflict. You can also select a default character set that is used to transcode Unicode files before merging.

Merge

Click to perform an automatic non-interactive merge.

Next

Click to perform a manual interactive merge.