Automatic merge in clearcase using cleartool findmerge command

断了今生、忘了曾经 提交于 2019-12-06 03:17:27

The problem with findmerge, as this technote describes, is that it can report back inconsistent "Needs Merge" depending on the location of merge hyperlinks.

And that isn't likely to be fixed anytime soon:

This requires significant architectural change and will not be addressed in the next 18 months.
Please work with Rational Customer Support to learn UCM best practices to get around this is the limitation.

I haven't found an easy solution:

I usually findmerge on directory first (-type d), which don't have that extra message issue.
Then if all the directories are merges, I go on on files, with -merge -abort (to stop at the first conflict): since your merge shouldn't have any conflict in the first place, that mode (-merge -abort) is less likely to report the "Needs merge" message.

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