How to distinguish if merge was manually or automa

2019-08-06 12:13发布

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

标签: clearcase
1条回答
Lonely孤独者°
2楼-- · 2019-08-06 12:56

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.

查看更多
登录 后发表回答