svn local delete, incoming delete up

分类:技术文档 - SVN | 阅读(2557) | 发布于:2015-04-24 10:51

    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