Merge from one stream to another

You can merge changes from one stream to another.

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.

To merge changes in streams:

  1. In the web client, in the My Current Stream view, select a stream to merge.

  2. On the toolbar, click Merge streams. The Merge wizard opens.

  3. In the Merge wizard, specify the following details:

    Field Description

    Merge changes from this stream

    Specify the source stream for this merge:

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

      • Home stream. Select the home stream associated with the work area.

      • Parent stream. Select the parent of the home stream associated with the work area.

      • 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

        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.

    2. (Optional) Select a specific stream version. By default, the changes are merged from the latest version.

    3. Click OK.
    Merge changes into this target stream

    Enter the name of the target stream, or click Select and select a stream from the list. By default, the changes are merged to the stream from which you opened the merge.

    To change the direction of the merge, click the swap button. After swapping, you may need to change the work area to one that is associated with the target stream.

    Note: You can merge only to the latest version of the target stream. Before merging, update your work area and deliver local changes.
    Merge using this work area Select the work area where to perform the merge, or enter the work area path.
    Perform an interactive merge This option enables you to manually review the merge results before applying them to the work area.
    Limit the scope of the merge to this folder

    This option enables you to restrict the scope of the merge to a specific folder. Browse to a folder or enter the folder's path.

    If you opened the Merge wizard from a subfolder, the subfolder's path is displayed.
    Advanced (Optional) Set advanced options described next.
    Include repository files Enter an expression to merge only specific files. For details, see Include and exclude files and folders.
    Exclude repository files Enter an expression to exclude a set of files from the merge. For details, see Include and exclude files and folders.
    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 that don't have conflicts. You can also select a default character set that is used to transcode Unicode files before merging.
    Skip summary before updating the work area Select this option if you don't want to review the summary before starting the merge.

  4. To start an automatic non-interactive merge, click Merge.

    For a manual interactive merge, click Next.

  5. If there are conflicts during a non-interactive merge, or you're performing an interactive merge, the Review Changes page opens.

    Review the list of conflicts and select a resolution for each one. See Review changes for update or merge.

    Then click Merge.

After a successful merge, you can deliver the files to the repository. For details, see Deliver changes to streams.

Back to top

See also: