Thank you - good to know it can be safely cancelled. I got this as well for a recent merge, and with 10,000+ revisions it takes 5 minutes to come back. And I still have no idea what files or folders it is looking for!
On Tuesday, 1 May 2018 02:13:59 UTC+10, tschoening wrote: > > Guten Tag TortoiseSVN on behalf of tschoening, > am Montag, 30. April 2018 um 17:38 schrieben Sie: > > > So, is there any way to get the old behaviour back? Thanks! > > I feel stupid now, but it's at least possible to simply click "Abort" > in the dialog fetching the tree conflict details and afterwards I get > the correct dialog to "Postpone" or "Mark as resolved". This way I > don't need to wait. > > Does this create any problems? > > I initially thought this would abort the whole merge process and > therefore didn't try. Maybe add a textual message, that "Abort" is > fine if one doesn't want to wait and knows what one is doing? > > Mit freundlichen Grüßen, > > Thorsten Schöning > > -- 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/2e2f4c10-26d7-45bf-9fab-bd678190f187%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
