Resolve Tree Conflict SVN (local unversioned, incoming add upon update)

来源:互联网 发布:淘宝开店招牌素材 编辑:程序博客网 时间:2024/06/04 20:09
$ svn statusD     C logs      >   local unversioned, incoming add upon updateSummary of conflicts:  Tree conflicts: 1

The solution that I’ve found works best is:

$ svn resolve --accept working logsResolved conflicted state of 'logs'$ svn revert logsReverted 'logs'$ svn status$

原文章地址 需要翻墙

0 0
原创粉丝点击