Merging Changes from Requests in a Different Stream

1. In the Requests view, select one or more change requests, right-click, and select Merge from Request. The Merge Streams wizard opens.

2. The Merge changes from this request box displays the selected change requests. To add change requests, enter their IDs separated by commas. To specify different change requests, click Select and select a product and change requests.

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

3. The Include changes from this stream box displays the stream that contains the change requests. To select a different stream, click Select and navigate to the stream.

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 the Swap button.

6. Accept the default project work area or specify one. To use a different work area, enter its path or click Select and browse for one.

7. To interactively (manually) verify the merge results before applying them to the work area, select Perform an interactive merge.

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

9. (Optional) Click Advanced.

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

- The Include repository file box to include only specific file types.

- The Exclude repository file box to exclude specific file types.

For details, see Using Wildcards to 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 file changes associated with the specified request will be merged. To merge all changes, clear Cherrypick file changes. For more details, see Merging Specific Changes between Streams.

13. To automatically merge files that don't have conflicts, 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.

14. To perform an automatic non-interactive merge, click Merge.

    To merge manually, click Next.

    If there are no conflicts, the merge completes successfully.

    If there are conflicts, the Review Changes page is displayed. Review the list of conflicts, select an appropriate resolution for each one, and click Merge.

After the successful merge, you are prompted to deliver the files to the repository.