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

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.

转自：http://blog.chinaunix.net/uid-22197900-id-3249597.html