svn up 提示冲突:
Skipped 'ApiController.php' -- Node remains in conflict At revision 271. Summary of conflicts: Skipped paths: 1 解决方案1:不行就换方案2
svn remove --force ApiController.php svn resolve --accept=working ApiController.php
svn update 方案2:
1
2 svn revert --depth=infinity ApiController
svn update
没有评论