您的位置: 首页 > IT文章 > SVN remains in conflict

SVN remains in conflict

分类: IT文章 • 2024-06-05 13:52:19

SVN remains in conflict?

svn remove --force yourfilename
svn resolve --accept=working  yourfilename
svn commit -m ""

svn remove --force yourfilename svn resolve --accept=working yourfilename svn commit -m ""