Do one of the following:
In Solution Explorer right-click a solution, a project, or an item and select Merge.
In Serena Explorer right-click a stream and select Merge from Stream.
In the Dimensions Projects view select a stream or project and on the toolbar click Merge.
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.
In the Merge changes from this stream box specify a stream that will be the source for this merge. Do one of the following:
Click Select and use the Select Stream dialog box to specify a stream. Optionally specify a stream version.
Enter 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.
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 only merge into the latest version of the target stream. Update your work area and deliver local changes before performing a merge.
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.
The default project work area is displayed in the Merge using this work area box. To use a different work area enter its path or click Select and browse for one.
To interactively (manually) verify the merge results before applying them to the work area, select Perform an interactive merge.
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.
(Optional) Click Advanced to configure more merge options.
To restrict the marge to particular files or folders enter wildcard filters in:
The Include repository file box to only include 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.
To apply the repository date and time to the files in the merge select Apply repository date and time.
To automatically merge files whose content does not conflict, select Auto merge non-conflicting file content. Select a default character set.
To merge do one of the following:
If you performing an automatic non-interactive merge click Merge.
If you performing a manual interactive merge click Next.
If there are no conflicts the merge completes successfully. If there are conflicts, the Review Changes page is displayed. Do the following:
Review the list of conflicts and select an appropriate resolution for each one.
Click Merge.
After the merge has completed successfully you are prompted to deliver the files to the repository.