Subversion resolve for Tree Conflict

A little  while ago I started using Subversion or SVN for short as my centralized SCM. I have installed the VisualSVN Sever because it is easy to use and has MMC integrated easy configuration management. I have many problems with conflicts because this was a startup project and there was a many editing/deleting/moving of files. First three times I was desperate I just couldn’t commit to the SVN repository so in my wave of frustration I just delete the repository, create new one, and go on.

Now I have about 60 revisions (without 20 revisions early deleted repositories), and didn’t want to delete all my history and start again. To day I was making a major project refactoring, and at the end I just couldn’t commit. SVN was complaining about “tree conflict”, so I just have to find the solution.

Here is the SVN definition of  a “tree conflict”:

tree conflicts

A tree conflict occurs when a developer moved/renamed/deleted a file or folder, which another developer either also has moved/renamed/deleted or just modified.

And while I was digging information about “tree conflict” I found my solution, and it is very easy, executing resolve command. You have to use Command Prompt and have to be inside the directory of project and better directory where tree conflict emerged. Command looks like this:

svn resolve --accept working -R .