Stefan schrieb am Freitag, 11. Dezember 2020 um 19:28:24 UTC+1: > try r29039
Did you compile and test the changes yourself before you published them as a new nightly build? I don't want to be rude, but it just looks like you didn't. I tested all options and found that each of them can be used again. However I did *not* take the time to test whether the chosen options are applied correctly, because I am confident that this part still works. But I found other things that seem to be broken: - The color of the conflicting lines used to turn green after a solution for a conflict was chosen. This is no longer the case, the color stays red. - The status line does not update. After resolving all conflicts, it still says "conflicted:80, ..." - "Jump to next conflict" is still shown and cycles through all lines of previously conflicting files. So it looks like the entire GUI is not updated. Another thing I found, which may be intended, but questionable: After aborting the merge conflict dialog and upon reopening it, the dialog is shown again for every item that was "postponed" in the first run. Since a user chose to postpone it on that run, I think he also would postpone it on the next run, because postponing actually is a solution that the user chose, they just did not resolve the conflict. Therefore in my opinion, the dialog should not be shown again for postponed items, but others may think different about that. You might show a checkbox at the bottom of that dialog of at the bottom of the "merge finished" dialog, saying "retry solving merge conflicts on postponed items" to deal with both situations, but since I usually don't postpone items, I cannot tell about the need of such an option. A minor suggestion for improvement on the merge conflict dialog at the end: 1) I would use slightly different labels: "Recect incoming for conflicts" instead of "Reject conflicts", along the lines of "Accept incoming for conflicts" 2) I don't see a relevant benefit of the clickable label "Jump to next conflict", since the "merge conflict" dialog starts at the first unresolved item in the list when (re)opened. I understand that users may want to go through the conflicts in that list, but then you should add the possibilty to open the "merge conflict" dialog on a specific file. The context menu of a conflicting file in the "merge finished" dialog currently shows "edit conflict", "mark as resolved", "resolve using mine", resolve using theirs". Either you could add "open 'merge conflict' dialog", or you could add the missing options from the merge conflict dialog: "accept incomfing for conflicts", "reject incoming for conflicts", ... Regards Tobias -- 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/058f26f7-dc97-4197-bc6d-5a6aa1377c95n%40googlegroups.com.
