SVN tree conflicts can be insanely annoying – especially when they occur because you’ve deleted something locally and then an incoming change also deletes it. They can also be hard to resolve from most IDEs.
The trick is to resolve them from the command line. Edit/create/delete the files to get things into the state they should be and then from the command line run:
svn resolve --accept working <path>
No more tree conflict.
Category: Code and Geek Stuff, Source Control
Rob Dawson says:
I prefer the answer which involves replacing svn with git.
Adrian Sutton says:
Well yes, that also works well. A little harder to do when you use the sequential nature of SVN revision numbers all over the place though (which to be fair works really nicely).
Danny Yates says:
Although you can fairly easily replicate that with appropriate hooks on the git master.