Hi all, I've recently updated to TortoiseSVN 1.10.0 and have some problems during merges between trunk and tags in my projects.
My trunk is for development and contains e.g. Eclipse specific files, test data and such. The tags are originally based on the trunk, but development only files and directories have been removed. Within the trunk those files are still there and change fomr time to time. So if I merge from trunk to a tag I get a tree conflict because of missing files and dirs within in the tag, whcih have been changed in the trunk. In the past this was no big deal, I simply marked the conflict as resolved and the odl tree conflict dialog and things continued. with the new version the tree conflict has changed and is fetching some data from the server to only tell me after a minute or so that no resultion could be found and to allow me to mark as resolved as well. The problem is the waiting time, I know there's no solution to be found and would prefer to mark instantly as resolved like in the former version. I'm working over OpenVPN from my home office and fetching all the data simply takes some time. So, is there any way to get the old behaviour back? Thanks! Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail: [email protected] AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...........05151- 9468- 55 Fax...............05151- 9468- 88 Mobil..............0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow -- 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/1502426915.20180430173830%40am-soft.de. For more options, visit https://groups.google.com/d/optout.
