New merge conflict handling dropped the "Postpone All" conflicts option

[dan....@formativhealth.com]

I used to rely on the "Postpone All" conflicts option during merging.

With the new merge conflict handling dialogs, this "Postpone All" option is gone. Could it be brought back?

I always prefer to perform the entire merge, then see all of the conflicts as a whole and deal with them; for example using the TortoiseSVN "Resolve" dialog. I don't want to deal with the conflicts one at a time during the merge process, when I have no idea how many there are going to be.

[Stefan]

just click the "Cancel" button.

[dan....@formativhealth.com]

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.

[Stefan]

please specify exactly what you do to get the conflict dialog twenty times and cancel doesn't postpone all conflicts.

[dan....@formativhealth.com]

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.