Use case in 1.9: 1. TortoiseSVN -> Merge, Merge a range of revisions. Let's say I want to merge revision 10, 14, 18 from branch A to branch B. 2. Revision 10 causes a conflict. The old merge resolution dialog would pop up with several options. 3. I choose an option that resolves the conflict e.g. "Resolve using theirs". 4. The conflict is resolved and the merge continues with revision 14, and so on.
In 1.10 instead the following happens: 1. TortoiseSVN -> Merge, Merge a range of revisions. Let's say I want to merge revision 10, 14, 18 from branch A to branch B. 2. Revision 10 causes a conflict. The new merge resolution dialog would pop up with several options. 3. The merge is immediately aborted with the message "resolve all conflicts and rerun the merge to apply the remaining unmerged revisions" as the dialog opens. 4. I choose an option that resolves the conflict e.g. "Reject conflicts", or Edit -> Mark as resolved. 5. No matter what, the merge is already aborted and to continue, I have to go back and rerun the whole command again. Is there a setting available somewhere to get back to the 1.9 behaviour where I could continue a multi-revision merge with conflicts, resolving conflicts as I go? This is a somewhat big snag in my workflow, working with fairly complicated code bases and branches, and redoing the whole merge command multiple times is time consuming for me... -- 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/131b4edf-de10-4a5e-b219-b3869275206b%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
