嘗試用下面兩種方法
- svn clean up 中有一個選項break lock勾選上
- 把對應的文件來里的.svn里面的lock文件刪除。
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 --depth infinity foo/ $ svn revert foo # 3.Now delete that file: $ rm foo # 4.Conflict resolved: $ svn st # Done.