How do I get this directory out of conflict? May 18, 2011 Remove the SVN conflict: svn remove --force filename svn resolve --accept=working filename svn commit Read more