Merge Change Requests from a Stream wizard

This wizard helps you to merge changes from requests owned by another stream into a target stream.

Merge uses a work area to apply changes and process conflicts. This enables you to safely merge, build, and test before delivering the merge results to a target stream in a repository.

Field Description Rules and guidelines

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 change 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, enter 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

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, enter 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

You can merge only 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

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

 

Also include items related to child requests

Merges all items that are related to child Dimensions CM requests of the selected change requests.

 

Advanced

Click to display advanced 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.

 

Cherrypick file changes

By default only the file changes associated with the request(s) that you specified will be merged. To merge all changes unselect this option.

For details about cherrypicking, see Merge specific changes between streams.

 

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.

 

If you are performing an automatic (non-interactive) merge, and there are no conflicts, the merge completes successfully.

If there are conflicts, or you selected a manual (interactive) merge, the Review Changes page opens. Review the list of conflicts and select a resolution for each conflict.

After the merge has completed successfully, deliver the files to the repository.

Back to top