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

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

引用自http://yiyanwan77.iteye.com/blog/1687718

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.