Comparing and Merging › Merge a Branch Version to the Trunk

Merge a Branch Version to the Trunk

The concurrent merge process lets you merge a branch version to the trunk.

Follow these steps:

1. Navigate to the package that has the branch version you want to merge.
2. Right-click the package, and select concurrent merge process from the shortcut menu.

   The concurrent merge process dialog appears.

   Note: The lowercase italic text indicates the process dialog name by the process type, since the process execution dialog names differ to each site.

3. Select Merge options:

   Merge Conservatively

   Creates a merge-tagged version, regardless of the contents of the versions. An exception is when the branch version is the latest version in the view; in this case, it is closed and a normal version is created.

   Merge Aggressively

   Creates a merge-tagged version only when conflicts are found. If no conflicts are found, the branch and trunk versions are merged to create a normal version.

   Note: A conflict occurs when a set of lines is modified in both the branch and the trunk; however, insertions and deletions are not conflicts.

   Take Trunk Version

   Selects the trunk (target) to create the final version automatically, without comparing the contents of the versions. This option closes the branch, but does not create any versions on the trunk.

   Take Branch Version

   Selects the branch (source) to create the final version automatically, without comparing the contents of the versions. This option creates a normal version on the trunk and closes the branch.

   The merge behavior is set.

4. (Optional) Click the tabs to enter and view information:

   Comment

   Specifies comments.

   Note:

   • If you do not specify any comment, then the comments are copied from the latest branch version and are placed in the newly created trunk version.
   • If you specify any comment, then the comments from the Concurrent Merge dialog are copied and are placed in the newly created trunk version.
   • While resolving the M-tag (Interactive Merge), the comments provided in the Interactive Merge dialog are copied to the newly created N-tag (resolved version). However, if you do not specify any comment in the Interactive Merge dialog, the newly created N-tagged version shows up blank comment.

   Note

   Provides notes about the process.

5. Click OK.

   A version is created on the trunk and is the latest in the view.