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 -- 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/652312661.20180430181354%40am-soft.de. For more options, visit https://groups.google.com/d/optout.
