svn问题：local delete incoming delete upon update解决方案

1. 同事删除了文件并且提交了，而我又修改了我本地的文件，所以在我使用svn status查看状态的时候就出现了一个下面的信息：
2. svn local delete, incoming delete upon update 
3. 解决办法：
4. # 1.In your working directory, recreate that conflicting file:
5. $ touch foo
6. # 2.Revert that file to the state SVN likes (that means deleted):
7. $ svn revert foo
8. # 3.Now delete that file:
9. $ rm foo
10. # 4.Conflict resolved:
11. $ svn st
12. # Done.

简单来说就是：1.在工作目录下重新创建该冲突文件，2.恢复该文件在svn中的状态，3.删除该文件，4.冲突就解决了