I agree to your enhanced suggestion. The conflict resolution process should not start automatically, but per button-click (there may be an option "start conflict resolution automatically" though). That button would have the advantage that you could re-start the conflict resolution process after you have (accidentally) aborted it. About the labelling of the "abort" button: since there is an option "Postpone" (equals "skip/cancel conflict resolution for this file"), the meaning of "abort" in my opinion is clear enough. But it can be improved by labelling it "abort conflict resolution process"; there's enough space for a wide button (or make it 40px high and use multiline text).
Bruce C schrieb am Montag, 7. Dezember 2020 um 18:04:18 UTC+1: > I agree that your suggestion would better fit my workflow too. > > I'd go futher and suggest that I'd simply want to get to the merge summary > first and review that before deciding whether I want to jump into the > conflict resolution. I expect that the argument against this would be that > the same result is achieved by simply cancelling the conflict resolution > dialog. My issue with that is that it's non-obvious whether the Cancel > button cancels the conflict resolution for all conflicted items or simply > the first conflicted item. I believe it's the former but this isn't obvious > (to me). This doesn't happen often (as I try to avoid these circumstances) > so when it does, I tend not to remember exactly what the Cancel button does. > > For me, I'd rather that the merge process simply displayed the merge > result, even if there are conflicts, rather than auto-start the conflict > resolution process. If I want to initiate conflict resolution, I can > initiate that separately. > > -- 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/f27d1acf-9a5b-4d20-8ce4-7e26ea50dc33n%40googlegroups.com.
