如何区分是手动还是自动合并？ [英] How to distinguish if merge was manually or automatically?

问题描述

是否可以区分是手动还是自动执行合并？
我在Windows上使用ClearCase 7.1.2，我想知道是否可以通过查看版本树或任何给定的命令行找到它

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

谢谢

推荐答案

如果自动，是指：是由交付/重新创建的版本，相对于到通过手动合并创建的版本，则与该版本关联的活动名称可以提供帮助：

如果它以'deliver'或'rebase'开头，则由交付/重置UCM进行操作（将所有更改的文件从一个Stream自动合并到另一个）

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)

但是，如果使用自动与手动，则表示版本是手动合并的，因为源和目标版本（ClearCase无法自动合并两者），然后否。

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.

这篇关于如何区分是手动还是自动合并？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！