1. 程式人生 > >解決subclipse同步衝突問題A conflict in the working copy obstructs the current operation

解決subclipse同步衝突問題A conflict in the working copy obstructs the current operation

服務端版本控制軟體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的內容,一個一個選擇列表中的衝突右擊將其標誌為已解決,然後回到專案再提交更改就可以了。