场景:在本地提交了文件,但是服务器商对应的文件死活不更新,svn up 发现错误提示

Skipped 'shop/task/crons/unipay_static_settlefenxiao_withdrow_records.php' -- Node remains in conflict
At revision 602.
Summary of conflicts:
  Skipped paths: 1


解决方案:
svn revert --depth=infinity  shop/task/crons/unipay_static_settlefenxiao_withdrow_records.php
svn up

问题解决

Logo

腾讯云面向开发者汇聚海量精品云计算使用和开发经验,营造开放的云计算技术生态圈。

更多推荐