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

来源:互联网 发布:甘肃知乎 编辑:程序博客网 时间:2024/06/05 04:05
  1. svn local delete, incoming delete upon update 解决办法

  2. # 1.In your working directory, recreate that conflicting file:
  3. $ touch foo

  4. # 2.Revert that file to the state SVN likes (that means deleted):
  5. $ svn revert foo

  6. # 3.Now delete that file:
  7. $ rm foo

  8. # 4.Conflict resolved:
  9. $ svn st
  10. # Done.

转自:http://blog.chinaunix.net/uid-22197900-id-3249597.html

原创粉丝点击