Merge Change Requests from a Stream

Merge changes from the request(s)

Displays the selected requests. To select different requests, do one of the following:

• Click Select and use the Request Selection wizard to choose requests.

• Enter the request IDs and separate each one with a comma.

You cannot merge request changes from different streams in the same merge operation.

Include changes from this stream

If the requests you specified belong to the same stream, displays the stream ID. To select a different stream 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.

• Enter the stream ID in this format:

PRODUCT:STREAM_NAME

For example:

QLARIUS:JAVA_BRANCHA

You can only merge from the latest version of the stream.

Merge changes into this target stream

Displays the target stream for the merge. 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.

• Enter the stream ID in this format:

PRODUCT:STREAM_NAME

For example:

QLARIUS:JAVA_BRANCHA

You can only merge into the latest version of 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

Review the merge results before applying them to the work area.

Also include items related to child requests

Merge all items that are related to child requests of the selected change requests.

Include repository file

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

* - a wildcard character that matches any number of characters.

? - a wildcard character that matches any single character.

| - joins or concatenates multiple expressions.

\ - a separator for folders and directories (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 merged into the work area.

Cherrypick file changes

By default, only the changes associated with the requests that you specified will be merged. To merge all changes, unselect this option.

When you merge changes between streams you can select changes that are related to specific requests, commonly known as cherrypicking. For example, you have delivered multiple sets of changes to a stream but want to merge one specific set into a different stream.

For more details see Merging Specific Changes between Streams in the User’s Guide and the online help.

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.