A conflict in the working copy obstructs the CurOP

服務端版本控制軟件subversion，客戶端是eclipse的插件subclipse，我的感受仍是cvs比較簡單方便。明明沒什麼衝突，當刪除一個東西的時候總是提示錯誤，說衝突

A conflict in the working copy obstructs the current operation
org.tigris.subversion.javahl.ClientException: A conflict in the working copy obstructs the current operation
svn: Commit failed (details follow):
svn: Aborting commit: ‘D:/eclipse-java-ganymede-SR1-win32/workspace/myProject/database/src’ remains in conflict

org.tigris.subversion.javahl.ClientException: A conflict in the working copy obstructs the current operation
svn: Commit failed (details follow):
svn: Aborting commit: ‘D:/eclipse-java-ganymede-SR1-win32/workspace/myProject/database/src’ remains in conflict

解決辦法

右擊你要刪除的目錄–>team–>Show Tree Conflict–>在Eclpise中會出現一個Tab視圖顯示Tree Conflict的內容，一個一個選擇列表中的衝突右擊將其標誌爲已解決，而後回到項目再提交更改就能夠了。

注意：我用的版本subclipse是http://subclipse.tigris.org/update_1.6.x

Comments are closed.