svn提交冲突

解决 SVN Skipped 'xxx' -- Node remains in conflict
svn 提交报错
提交命令:
svn update
提示代码:
Skipped 'test.cpp' -- Node remains in conflict
At revision 271.
Summary of conflicts:
【svn提交冲突】Skipped paths: 1
解决方法:
svn remove --force test.cpp
svn resolve --accept=workingtest.cpp
svn update
提交成功!
Updating '.':
At revision 271.

    推荐阅读