Is there a way to continue with the current merge after resolving conflicts?
Currently, when merging a revision, SVN halts the merge when it encounters an error (conflict) to resolve it. (The message supplied by SVN is 'resolve all conflicts and rerun the merge to apply the remaining unmerged revisions') However, after resolving the issues in a particular revision, a brand new merge must be performed... very time consuming when performing a large merge from multiple revisions, or when working in an organization where there are hundreds of commits performed daily. It would be great if instead, SVN could pick up the merge from where it left off before resolving conflicts, the same way it can resume a Commit if the repo needs to be updated when attempting to perform one. -- 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/de9e722e-b53f-4d1c-8dd4-c561b8b2203c%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
