Merge changes from this baseline

Displays the baseline that is the source for the merge.

To select a different baseline, enter the baseline ID in this format:

PRODUCT:BASELINE_NAME

Or click Select and use the Select Baseline dialog box to select a product and baseline.

Merge changes into this target stream

Displays the target stream for the merge. To select a different stream, enter the stream ID in this format:

PRODUCT:STREAM_NAME

For example, QLARIUS:JAVA_BRANCHA.

Or click Select and select one of the options in the Select Stream dialog box. If you select Another stream, do one of the following:

• Enter a text string to display only those project/stream names that contain the characters in your string. For example, to find QLARIUS:JAVA_BRANCHA, enter vs.

• Select a project/stream from the list. Favorites and recently used projects/streams are displayed at the top.

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

Merge using this work area

Select the work area where to perform the merge, or enter the work area 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.

You can use the following wildcards:

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

• ? matches a single character.

• | joins or concatenates multiple expressions.

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

Exclude repository file

Enter an expression to exclude specific file types from the merge

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.