摘要：
[link:http://stackoverflow.com/questions/4317973/svn-how-to-resolve-local-edit-incoming-delete-upon-update-message]Short version:$ svn st! + C foo > local edit, incoming delete upon update! + C bar > local edit, incoming delete upon update$ touch foo bar$ svn revert foo bar$ rm foo... 阅读全文
