When executing a merge, the last dialog is a (long) scrolling list of file names, showing which files have been merged. If there are conflicts in the merge, the line of the respective file is shown in read. After the merge has finished, the first red line is selected and the "Edit Text Conflicts" dialog is shown (in case of text files). This conflict dialog blocks access to the file list dialog, so I cannot scroll down and see the summary. I don't even recall at the moment whether the summary tells about the number of merged files and, what I need, the number of conflicting files, but you cannot see it anyway since you cannot scroll down to the end as long as any of the conflict dialogs is shown. Therefore, please make the following improvements: 1) if you click "abort" on the conflicts dialog, add a possibility to re-enable this dialog and the automatic sequence of showing that dialog for every conflicting file. 2) show the summary not only at the end of the file list, but also in an additional label underneath the file list control, see screenshot.[image: tsvn-merge-conflict.png]
-- 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/c0a95e1d-3e5d-4c0e-9c84-17e3474cb5e1n%40googlegroups.com.
