Resolve Tree Conflict SVN

最新推荐文章于 2024-06-14 13:54:47 发布

转载最新推荐文章于 2024-06-14 13:54:47 发布 · 1.2k 阅读

代码管理专栏收录该内容

57 篇文章

订阅专栏

本文介绍了一种常见的Subversion(SVN)版本控制系统中遇到的树冲突问题及其解决方案。当更新站点时，如果log目录被误删除，可能会出现本地未版本化的文件与远程新增文件之间的冲突。文章提供了一个简单的步骤来解决这个问题：使用`svn resolve --accept working`命令接受工作副本状态，然后回退更改。

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

This is something I come across surprisingly often. When rolling out a new site, we try to never remove the logs directory seeing things like apache will have the log files open. We rollout using svn, which tends to leave us in a bit of a messed up state, if you see something like the following with your repo, this advice is for you!

   $ 
  svn status
  
 D     C logs
  
  >   
  local unversioned, incoming add upon update
  
 Summary of conflicts:
  
   Tree conflicts: 1

The solution that I've found works best is:

   $ 
  svn resolve 
  --accept working logs
  
 Resolved conflicted state of 
  'logs'
  
 $ 
  svn revert logs
  
 Reverted 
  'logs'
  
 $ 
  svn status
  
 $
 