Jump to content
JakubH

Evil twin conflict resolution

Recommended Posts

I have a question about evil twin conflict resolution. First I quote from here: http://www.plasticsc...developers.html

Evil twin variations

Evil twins happen when an item with the same name (file or directory) is added in two parallel branches.

  • /test/testreport.txt is added on /fix130
  • /test/testreport.txt is added on /fix131

They may, or may not, refer to the same file (they can be totally different files under the same name), so the merge system detects it and lets the user select how to rename one of them.

Alternatively, the algorithm can treat them as the same item (like Git, which is unable to track items by ID as a design decision) and merge them. An evil twin can also happen if two files are moved to the same destination on parallel branches, making more explicit the need for a specific handling.

What others do

Always merge the two files directly (which is only SOMETIMES the best option).

How can I choose merge those two files/directories? The conflict resolution dialog offers me to keep one of them or both, but there is no merge option!

Share this post


Link to post
Share on other sites

Hi JakubH,

merge the two files is not supported by Plastic SCM, that option is in "What others do" section. Not Plastic, sorry.

In Plastic you can keep both, or one of the evil.

Share this post


Link to post
Share on other sites

Oh. That's really bad. :-(

As it is written in the article: it is sometimes the best option! I know, that only sometimes, but still – you ignore those cases.

Is it possible to add this functionality or it is somehow against your philosophy?

Share this post


Link to post
Share on other sites

Yes sure, we have been thinking about that extra option a lot of times, I think that if you add the idea into the uservoice system you will push us to implement it.

Share this post


Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now

×