Merging Changes

1. Do one of the following:

- In Solution Explorer, right-click a solution, a project, or an item and select Merge.

- In the Dimensions Projects view, right-click a stream and select Merge from Stream.

- In the Changesets view, right-click a changeset and select Merge from Stream Version.

The Merge Streams wizard opens.

TIP The context from which you merge determines the scope. For example, if you select a Dimensions CM stream or a Visual Studio project the whole stream will be merged. If you select a subfolder, only the file types scoped by the folder and its sub-folders will be merged.

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

n Click Select and specify a stream in the Select Stream dialog box. Optionally, specify a stream version.

nEnter the name of a stream, and optionally a version number, in this format:

PRODUCT:STREAM_NAME;VERSION

For example:

QLARIUS:JAVA_BRANCHA_STR;5

NOTE Omitting a version number merges changes from the latest stream version.

3. 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. Update your work area and deliver local changes before performing a merge.

4. To change the direction of the merge, click the Swap button.

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

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

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

7. To restrict the scope of the merge to a specific folder and its sub-folders, select Limit the scope of the merge to this folder and browse to the folder, or enter its path.

8. (Optional) Click Advanced to configure more merge options.

9. To restrict the marge to particular files or folders enter wildcard filters in:

- The Include repository file box to include only specific file types. The default filters are determined by the context from which you invoked the merge.

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

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

11. To automatically merge files that don't have conflicts, select Auto merge non-conflicting file content. Select a default character set.

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