svn local delete, incoming delete upon update 解决办法 # 1.In your working directory, recreate that conflicting file: $ touch foo # 2.Revert that file to the state SVN likes (that means deleted): $ svn revert foo # 3.Now delete that file: $ rm foo # 4.Conflict resolved: $ svn st # Done.最后还需要指定更新文件:svn up application.js
svn local delete, incoming delete up
标签:
二维码生成中...
扫码阅读