On Friday, June 8, 2018 at 11:33:51 AM UTC-4, Stefan wrote: > On Friday, June 8, 2018 at 5:14:54 PM UTC+2, (unknown) wrote:On Friday, June > 8, 2018 at 11:04:09 AM UTC-4, Stefan wrote: > > > just click the "Cancel" button. > > > > just click the "Cancel" button, (twenty times). This is something that > worked well in the old version, but the 'improved' dialogs took a step > backward in regard to this functionality, which was removed. > > > > > please specify exactly what you do to get the conflict dialog twenty times > and cancel doesn't postpone all conflicts.
I just tried it again, and you are correct. Cancel does in fact postpone all conflicts. So, the wording of "Cancel" is just a lot less clear in this regard than "Postpone all remaining conflicts" was. Especially when presented with other options like Postpone and Reject all incoming, etc. Cancel what? The merge, I would assume... Good to know though... thanks. -- 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/73b5ddd0-4c0f-408a-b4d7-d51d29b2e8e3%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
