On Tuesday, April 14, 2020 at 7:19:32 AM UTC-4, Philipp Schäfer wrote: > > A coworker saw the necessity to add the same files to both this branch and > the trunk. However, he also comitted changes to the added files afterwards. I > merged the content of the trunk into this branch (auto merge with dialog > defaults, the branch working copy was updated beforehand). There were of > course tree conflicts for the files added to the branch and the trunk. I > clicked on the replace and merge option. >
Usually in this situation, I use "merge," not "replace and merge." In fact, I just had such a tree conflict earlier today, and "merge" handled it perfectly. (I use svn's command line client, but I assume TortoiseSVN has the ordinary "merge" option.) Hope this helps, -- 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/6d59a22f-a209-4331-9108-29cb59cdaacf%40googlegroups.com.
