邪恶孪生问题和减法合并 [英] Evil twin problem and subtractive merge

问题描述

有人能解释一下Clearcase中的邪恶孪生和减法合并吗？

Could anyone explain what is a Evil Twin and Subtractive merge in Clearcase?

推荐答案

邪恶双胞胎

Evil Twin是您已删除（使用rmname的元素）并想要重新添加的元素，但该目录的先前版本中存在 evil twin。

An Evil Twin is an element that you have removed (using rmname) and want to re-add, but it's 'evil twin' exists in previous versions of the directory.

您必须记住每个元素都有一个唯一的ID，因此您试图添加一个具有相同名称的元素-但使用不同的UID。

You have to remember that each element had a unique ID, so you are attempting to add an element with the same name - but with a different UID. This is not allowed.

处理Evil Twin的最佳方法是将您可以找到的现有元素的最新版本重新链接到目录的新版本。然后，您可以制作该元素的新版本并替换其中的数据。

The best way to deal with an Evil Twin is to relink the newest version you can find of the existing element to the new version of the directory. You can then make a new version of the element and replace the data within it.

相减合并

减法合并与选择性合并相反。

A subtractive merge is the opposite of a selective merge.

选择性合并（默认为沼泽标准合并）会将对另一个元素版本的更改添加到您签出的版本中。

A selective merge (the default, bog standard merge) adds the changes from another element version into your checked-out version.

一个减法合并尝试从您检出的版本中删除在另一个版本中所做的更改-因为它是一个不好的版本，您在其中犯了错误等。

A subtractive merge attempts to remove the changes made in a different version from the version you have checked out - because it's a bad version, you've made mistakes in it etc.

这篇关于邪恶孪生问题和减法合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！