SVN：One or more files are in a conflicted state.

SVN：服务器资源删掉，本地添加时和删掉的名字同名出现One or more files are in a conflicted state.

异常处理汇总-开发工具 http://www.cnblogs.com/dunitian/p/4522988.html