Highley Recommended, Inc.

NAVIGATIONCLEARCASE MERGES

CM Home
CM Resources
Getting Started
Config. Spec.
CM Procedures
Scripts
Triggers
CM Plan
ClearCase Best Practices
Merging
ClearCase FAQ

Merge Quick Reference

How do I merge?

Under the new procedure, merges will be primarily controlled by the Configuration Manager. However, there will be times that it will still be necessary to make your own merges (such as when you are merging a private branch back into the new feature or bug fix branch).

There are two ways to merge. For large merges that encompass a great many files, it is useful to use the graphical merge manager in ClearCase Home Base. For smaller merges of one or two files, it is easiest to use the version tree browser.

When you are merging to an integration branch like the release1 branch you need to merge out to your private branch first. We do this to minimize build integration issues on base branches that all development is using.

Make sure that you can at least build with out errors and we preferr that compliation warnings are removed as well. It is also a good practice to test your build with the hardware. After these steps are followed you can then merge to an integration branch, but you will not be able to do the check in step. Notify the CM Adiminstrator of your plans to merge to an integration branch so that they can be prepared to finish the merge by checking in the files and doing a confirmation re-build step and labeling if needed.

Using the Merge Manager (more complicated but required for recursive merges):

  1. Create a Merge View. Since the merge manager merges to a series of rules created by a view, you must create a merge view first. The proper config_spec for the merge view can be found in Config. Specs.
  2. Open ClearCase Home Base.
  3. Select the "Branches" tab.
  4. Click the "Merge Manager" button.
  5. Select "new" in the dialog box.
  6. Select your view in the Merge Wizard "merge to" box.
  7. Select "next"
  8. Select the directory structure you want to compare in the next Merge Wizard dialog box. The more specific you are, the faster your merge will proceed.
  9. Click "Add"
  10. Click "Next"
  11. Select the branch or label you are merging from in the next Merge Wizard dialog box. Usually this is your work branch.
  12. Click "Next"
  13. Click "Finish"
  14. Select the files from the list that you want to merge and right click to select "merge".
  15. Test the build
  16. Check in the files.
  17. Label

Using the Version Tree Browser:

  1. Right click on the element you wish to merge.
  2. Right click on the version you wish to merge from.
  3. Select "Merge To"
  4. Click on the version you wish to Merge to.
  5. Resolve the merge conflicts as needed.
  6. Exit the Merge window
  7. Save the changes
  8. Test the changes
  9. Check in the element.
  10. Label.

For a directory in which you have added new elements, the directory needs to be merged rather than the individual file. The directory can be merged through the version tree browser just as a file element can. However, this is not recursive. For large-scale recursive merges, it is best to use the merge manager method.