Merging Changes across Streams

  1. Do one of the following:

  2. The Merge wizard opens.

  3. In the Merge changes from this stream box specify a stream that will be the source for this merge. Do one of the following:

  4.       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.

    PRODUCT:STREAM_NAME;VERSION

    For example: QLARIUS:JAVA_BRANCHA;5

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

  5. 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.

  6. NOTE  You can only merge into the latest version of the target stream. Update your work area and deliver local changes before performing a merge.

  7. To change the direction of the merge click Swap.

  8. NOTE  After swapping you may need to change the work area to one that is associated with the target stream.

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

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

  11. To restrict the scope of the merge to a specific folder and its subfolders, select Limit the scope of the merge to this folder and browse to the folder, or enter its path. If you invoked the Merge wizard from a subfolder its path is displayed.

  12. (Optional) Click Advanced.

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

  14. For details see Using Wildcards to Include and Exclude Files and Folders

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

  16. To automatically merge files whose content does not conflict, select Auto merge non-conflicting file content. In the desktop client and Windows Explorer integration you can also select a default character set that is used to transcode Unicode files before merging.

  17. (Web client only) To log the merge operation select Enable logging and enter the path where the log file will be saved, or click Browse and select a folder.

  18. To merge do one of the following:

If you deselected interactive merge and there are no conflicts the merge completes successfully. If there are conflicts, or you selected interactive merge, the Review Changes page is displayed. Review the list of conflicts and select a resolution for each one. Click Merge.

After the merge has completed successfully you are prompted to deliver the files to the repository, see Delivering Changes from a Work Area to a Stream.

Related Topics

Simple Three-Way Merge

Merging Changes from a Baseline into a Stream

Merging Changes from Requests Owned by Another Stream

Silently Merging a Child Stream into a Mainline Stream