svn冲突的解决方式

svn up的时候很经常会出现冲突，今天介绍两种最常见冲突的解决方式

svn local delete, incoming delete upon update的解决方式

//In your working directory, recreate that conflicting file:
$ touch foo
//Revert that file to the state SVN likes (that means deleted):
$ svn revert foo
//Now delete that file:
$ rm foo
//Conflict resolved:
$ svn st
//Done.

local unversioned, incoming add upon update的解决方式

当svn up的时候出现

C Runtime
>local unversioned, incoming add upon update

这是命令行下的svn树冲突了，（文件本身没有改变，只是本地版本库里面出现冲突而已）解决方法如下：

svn resolve --accept working ./Runtime
//Resolved conflicted state of 'Runtime'
svn revert ./Runtime
//Reverted 'Runtime'
svn status

通过以上的步骤就能移除掉本地svn版本库的冲突信息