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. For backwards compatibility, perhaps this might be a merge dialog option. On Monday, 7 December 2020 at 16:31:39 UTC Tobias Knauss wrote: > After resolving all conflicts, a label appears: "Merged:8, Added:187, > Deleted:61, Updated:531" > This information should be shown (and enhanced, and updated) directly > after the auto-merge has finished and before showing the first conflict > window. > > The reason why I would like to have the above mentioned numbers: If I see > "50 files with conflicts", then I can estimate how long it will take to > resolve them. If I don't know that number, I don't know whether it makes > sense to do that work today or leave the computer on and continue the next > day. I actually was just about to go home when I finished the last file. So > now I can commit and resolve the issue. > > -- 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/b498a4f1-d98f-4162-afde-457cf33dd903n%40googlegroups.com.
