完成私有ClearCase分支时如何忽略文件? [英] how to ignore files when finishing private ClearCase branch?

问题描述

我在动态视图中创建了一个私有分支，并签出了Eclipse .project文件.
我修改了.project文件以及其他Java类.

I created a private branch in dynamic view and checked out a Eclipse .project file.
I modified the .project file along with other java classes.

现在，我想完成私有分支并合并所有Java文件.

Now I want to finish the private branch and merge all the java files.

但是我不想合并.project文件.
我可以取消签出.project文件以继续，但是我想知道是否有一种方法可以告诉Clearcase忽略文件(例如svn和git忽略文件)并继续完成私有分支.

But I don't want to merge the .project file.
I can uncheckout the .project file to proceed but I am wondering if there is a way to tell Clearcase to ignore the file (like svn and git ignoring files) and continue to finish the private branch.

请让我如何忽略如上所述的.project文件?

Please let me how to ignore the .project file as described above?

推荐答案

您可以通过在分支中该.project的版本与该版本中的现有版本之间绘制一个红色箭头(合并箭头)来忽略"该文件.目标分支.
参见"在ClearCase中合并箭头"

You can "ignore" that file by drawing a red arrow (a merge arrow) between the version of that .project in your branch to the existing version in the destination branch.
See "Merge arrow in ClearCase"

cleartool merge -ndata -to aFile -version /main/a/SourceVersion /main/a/DestVersion

然后，您可以开始两个分支之间的合并.
.project将被忽略，因为ClearCase会认为它已经被合并.

Then you can start your merge between the two branches.
The .project will be ignored as ClearCase will think it has already been merged.

另一种选择是将其类型更改为"NEVER_MERGE"(如"自动交付合并")，但是会影响任何分支之间的.project合并能力.

The other alternative is to change its type to "NEVER_MERGE" (as in "deliver merge automatic"), but that would affect .project merge ability between any branch.

这篇关于完成私有ClearCase分支时如何忽略文件?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！