SVN X remains in tree-conflict

Question

I am using VisualSVN (which uses Tortoise). I accidentally move a folder to a different location. When tries to move it back, SVN pukes with this error. It happened once before and I managed to do some random updates/commits, not knowing what I was doing and it was "fixed". I cannot pull the same magic again, so I need to know how to get my files and directory and of tree-conflict.

Thanks!

Answer 1

I'm not sure what state it's in now, but your best bet would probably be to:

1. Move the folder out of your repository completely
2. Do an SVN clean
3. Do an svn update
4. Copy the files from the folder back (without the .svn files) overwriting the old source files that were just svn updated.

Answer 2

http://rubyjunction.us/subversion-hell-sh