Hi, I'm trying to automate some Subversion processes and I'm running into problems with conflicts. When I merge two branches, sometimes I get tree conflicts and regular (text) conflicts. I'd like to be able to resolve everything using the repository copy:
svn resolve . -R --accept theirs-full
but if there are tree conflicts, it yells at me and says I have to resolve them to the working state.
svn: warning: Tree conflicts can only be resolved to 'working' state; 'file' not resolved
Is there an easy way to resolve just the tree conflicts to 'working' so that I can then continue to resolve the text conflicts with theirs-full? Or maybe another way to accomplish my goal entirely? I'm looking to do this through the Windows command line. Thanks!
Subversion server is version 1.6.6
I'm using CollabNet Subversion Command-Line Client v1.6.13 (for Windows)