【ios】svn local delete, incoming delete upon update 解决办法

来源:互联网 发布:unity3d 5.5.2破解版 编辑:程序博客网 时间:2024/06/05 09:41

svn local delete, incoming delete upon update 解决办法

svn local delete, incoming delete upon update 解决办法
   # 1.In your working directory, recreate that conflicting file:
  1. $ touch foo
  2. # 2.Revert that file to the state SVN likes (that means deleted)
  3. $ svn revert foo
  4. # 3.Now delete that file:
  5. $ rm foo
  6. # 4.Conflict resolved:
  7. $ svn st
  8. # Done.