1. 程式人生 > >解決 SVN Skipped 'xxx' -- Node remains in conflict

解決 SVN Skipped 'xxx' -- Node remains in conflict

svn 提交報錯

提交命令:

svn update

提示程式碼:

Skipped 'test.php' -- Node remains in conflict
At revision 271.
Summary of conflicts:
  Skipped paths: 1

解決方法:

svn remove --force test.php
svn resolve --accept=working  test.php
svn update

提交成功!

Updating '.':
At revision 271.