In Dimensions CM, you can merge changes:
Across streams or their folders.
From a baseline into a target stream.
From requests owned by another stream into a target stream.
Merge is similar to Update and 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.
When you merge two objects, for example, a stream with another stream, or a stream with a baseline, Dimensions CM looks for a common ancestor. This is a point in time where the streams or work areas diverged. This is typically referred to as a three-way merge.
Example: Assume you have two streams that were created from the same baseline. Different developers perform modifications in both streams and deliver them to Dimensions CM. You now merge stream 1 into stream 2. Dimensions CM looks at the baseline (the common ancestor), finds the modifications that were delivered to stream 1 after that point, and merges those changes in stream 2.
The merging process uses changesets to find the common ancestor. See About changesets.
Guidelines and behaviors:
Merging can be automatic unless an interactive (manual) merge is required or there are unresolved conflicts.
A merge operation can be applied only to the work area of a target stream. The source must be different to the target stream (another stream, a baseline, or a request).
An Update operation is only possible from the stream that is associated with a work area. For instance, you can use Update from Request to update a work area with request changes associated with a work area stream. Use the operation Merge from Request to apply request changes from a different stream.
Micro Focus PulseUno provides you with an intuitive visualization of changes throughout your development process. You can also open peer reviews in PulseUno. For details, see the PulseUno online help.
If you are using a Linux client, you need to install the UNIX utility diff3 to enable automatic merge. For details, see Install Dimensions CM.