Merge changes from requests owned by another stream

In the desktop client, you can merge changes from one or more requests in another stream.

To merge changes from requests in a different stream:

  1. In the desktop client, select one or more change requests, right-click, and select Merge. The Merge Request wizard opens.

  2. The Merge changes from the request(s) box displays the selected requests. To specify different requests, click Select and choose requests in the the Request Selection wizard.

    To add change requests manually, enter their IDs separated by a comma.

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

  3. If the requests belong to the same stream, the Include changes from this stream box displays the stream ID.

    To select a different stream:

    • Click Select, and then select an option in the Select Stream dialog box.

      If you select Another stream, enter the stream's ID or select a stream from the list.

      To enter the stream ID, and optionally a version number, use this format:

      PRODUCT:STREAM_NAME;VERSION

      For example: QLARIUS:JAVA_BRANCHA;5

      When you start typing the stream ID, streams that contain any characters in the string are displayed. For example, to find QLARIUS:JAVA_BRANCHA, enter vs.

    Note: You can merge only from the latest stream version.

  4. 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 merge only into the latest version of the target stream.

  5. To change the direction of the merge, click Swap.

  6. In the Merge using this work area box, select the work area where the merge will be performed, or enter its path.

  7. To interactively review the merge results before applying them to the work area, select Perform an interactive merge.

  8. To merge all items that are related to child Dimensions CM requests of the selected change requests, select Also include items related to child requests.

  9. (Optional) To set advanced options, click Advanced.

  10. To restrict the merge to particular files or folders, enter wildcard filters in:

    • The Include repository file field to include only specific file types.

    • The Exclude repository file field to exclude specific file types.

    For details, see Include and exclude files and folders.

  11. To apply the repository date and time to the files in the merge, select Apply repository date and time.

  12. By default, only the changes associated with the requests that you specified will be merged. To merge all changes, clear the Cherrypick file changes option. For details about cherrypicking, see Merge specific changes between streams.

  13. To automatically merge files that do not have conflicts, select Auto merge non-conflicting file content. You can also select a default character set that is used to transcode Unicode files before merging.

  14. To merge:

    • For an automatic non-interactive merge, click Merge.

    • For a manual interactive merge, click Next.

If you cleared the interactive merge option, and there are no conflicts, the merge completes successfully.

If there are conflicts, or you selected interactive merge, the Review Changes page opens. Review the list of conflicts and select a resolution for each one. Then click Merge.

After the merge has completed successfully, you can deliver the files to the repository. For details, see Deliver changes to streams.

Back to top

See also: