JakubH Posted October 31, 2012 Report Share Posted October 31, 2012 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! Link to comment Share on other sites More sharing options...
This topic is now archived and is closed to further replies.