How to distinguish if merge was manually or automatically?

依然范特西╮ 提交于 2019-12-11 07:27:48

问题


Is that possible to distinguish if merge was performed manually or automatically? I'm using ClearCase 7.1.2 on Windows, and I'd like to know if you can find it by watching the version tree or by any given command-line

Thank you


回答1:


If by automatically, you mean: is a version created by a deliver/rebase, as opposed to a version created by a manual merge, then the name of the activity associated with that version can help:
If it starts with 'deliver' or 'rebase', it is made by a deliver/rebase UCM operation (which automatically merge all changed files from one Stream to another)

But if by "automatic vs. manual" you mean a version merged manually because there was a conflict between the source and destination version (and ClearCase couldn't automatically merge the two), then no.

The result of a merge is a new version with a "red arrow" between the source and the destination, without any indication as to how that new (merged) version was created.



来源:https://stackoverflow.com/questions/11192525/how-to-distinguish-if-merge-was-manually-or-automatically

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