Thank you for your support! The real issue is on the SVN side and I will open an issue at their tracker and ask for a change. The feature in its current state is almost unusable. There is close to zero value in getting a diff which just drops two big conflicting blocks on you. As Stefan pointed out, it is the expected behavior for a three way merge with an empty file as base.
In order to get something useful here, one would need to consider both base and first file (theirs) as the merge source and second file (mine) as the merge target. (This turns this merge effectively into a two way merge.) I will check if the merge (without replace) option shows this behavior. @Nathan The difference between merge and "replace and merge" would sadly be a future issue in my case. The target branch is a feature branch which is not immediately merged back and closed afterwards. (In which case you could simply ignore the tree conflict while SVN does its automatic reintegration merge.) So one would get the same tree conflict for every following merge from the trunk. Again thanks for the quick help and suggestions! -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/CAA6i0WaAJZ5MnkmDurL2%2BUEQ3%2B0vQvF6J6Q8UcKLqd0dPiKHYw%40mail.gmail.com.
