如何使用clearcase执行“合并”？ [英] How to perform a 'merge' using clearcase?

问题描述

我一直在研究分支X，我需要将我的代码移动到分支Y.我的所有代码都是我开始的新类，所以没有其他人工作/修改我的代码，这也不存在于分支，我正在将代码移动到。

所以我的问题是，将代码从一个分支移动到另一个分支的过程是什么？我以前从未这样做过。我是否将类复制并粘贴到新分支中，或者是否有通常用于此的工具？

解决方案

密钥ClearCase合并的合并是在目标视图（与您合并到的分支或UCM流相关联的视图）中进行合并。

然后您可以开始合并：

• 
  
  

  它假设你有：

  
  
  
  
  
  • 将标识要合并的源版本的源分支或标签，
  
  
  • 具有配置规范的目标视图，允许创建新版本在目的地分支之上（所以配置规范中包含 -mkbranch 规则）
  
  
  
  
  

  更多内容见关于合并基础ClearCase中的文件和目录：

  
  
  

  < img src =https://i.stack.imgur.com/d86ux.gifalt =clearcase merge>

  
  

  I have been working on branch X and I need to move my code to branch Y. All my code are new classes that I started, so no one else has been working/modified my code, this also does not exist in the branch that I'm moving the code to.

  So my question is, what is the process to move the code from one branch to another? i have never done it before. Do i copy and paste the classes into the new branch or is there a tool that is usually used for this ?

  解决方案

  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:

  • cleartool merge
  • Cleartool Merge Manager: see "Howto merge using the ClearCase Merge manager"

  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":

  这篇关于如何使用clearcase执行“合并”？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！