How to perform a 'merge' using clearcase?

☆樱花仙子☆ 提交于 2019-12-06 20:16:34
VonC

The key of a ClearCase merge is to do the merge in the destination view (the view associated with the branch or the UCM stream to which you merge to.

You can then start the merge with:

As you can see, the first step is to select said target view:

I would recommend using a dynamic view rather than a snapshot view: a snapshot would start by an automatic update (which takes time), as opposed to a dynamic view which would start the merge immediately.
See more at "What are the differences between a snapshot view and a dynamic view?"

It supposes that you have:

  • a source branch or a label which will identify the source versions you want to merge,
  • a destination view with a config spec allowing to create new versions on top of a destination branch (so a config spec with -mkbranch rules in it)

See more at "About merging files and directories in base ClearCase":

yepp, there's a tool that helps you: it's the ClearCase MergeManager. It has a nice GUI and helps you to get the job done.

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!