how to ignore files when finishing private ClearCase branch?

自古美人都是妖i 提交于 2019-12-08 07:02:31

问题


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.

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

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.

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


回答1:


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

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


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.



来源:https://stackoverflow.com/questions/24166263/how-to-ignore-files-when-finishing-private-clearcase-branch

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