SVN remains in conflict?
svn remove --force yourfilenamesvn resolve --accept=working yourfilenamesvn commit -m ""
svn remove --force yourfilenamesvn resolve --accept=working yourfilenamesvn commit -m ""发布时间： 2012-12-28 10:29:05 作者： rapoo
SVN remains in conflict?
svn remove --force yourfilenamesvn resolve --accept=working yourfilenamesvn commit -m ""