To merge all changes made on a subbranch

About this task

Complete each of the tasks listed in the merging all changes made on a subbranch scenario.

Procedure

  • To prepare a destination view for merging all changes made on a subbranch:
    1. Start a dynamic view or change directories to a snapshot view. The view must select the target versions (the latest version on the branch that will contain the results of the merge). In this scenario, the view must select opt.c@@/main/8. (See the figure.) If such a view does not exist, create one.
    2. If the target versions are checked out to your view for other revisions, create a pre-merge checkpoint by checking them in. To make it easier to find this pre-merge checkpoint, apply a label to the versions in the checkpoint.
  • To find changes before merging all changes made on a subbranch:
    1. Start the Merge Manager using one of the following methods:
      • From your destination view, type clearmrgman.
      • In HCL VersionVault Windows Explorer, click the Toolbox tab. Then click Base VersionVault > Merge Manager.
      You can use Merge Manager to find elements with versions on a specific subbranch and automatically merge any nonconflicting differences.
    2. In the Welcome window, click New.
    3. Follow the prompts and click Help for more information.

    For example, in the scenario figure, you find elements with versions on the r1_fix subbranch. In your project, several elements might have versions on the r1_fix branch. With the Merge Manager, you can choose for which elements you merge changes from one branch to another.

  • To merge all changes made on a subbranch:
    1. If the Merge Manager finds elements to merge, it asks whether you want to merge all elements now. Click Yes.
    2. In the Start Merge window, you can choose to automate the merge by selecting No, automate as much as possible. With this selection, all nonconflicting differences are completed without your input.

      If contributor versions contain changes that conflict with the base contributor, either Diff Merge or XML Diff Merge starts. (For each element with conflicting changes, a separate merge tool session starts.)

    3. Resolve conflicting differences in the merge window. Depending on the type of contributors you chose, either the Diff Merge or XML Diff Merge window is displayed.
    4. Save the merge results. For more information, click Help in the merge window.
    5. Exit the merge tool. If other elements with conflicting changes are found, another Diff Merge or XML Diff Merge session starts. Repeat Steps 3 and 4 until you resolve all conflicting merges.
  • To test and check in merge results:
    1. In the view that contains your merge results, build and test the results, resolving any build errors.
    2. When you are satisfied with the build and test results, check in all versions checked out to your view.
    3. Depending on the complexity of the merge, consider applying a label to this post-merge configuration.