svn提示出錯異常為remains in conflict

查看原文：http://www.ibloger.net/article/225.html

提交沖突代碼

 

commit -m "" E:/Program Files/MyEclipse 10/Administrator/Workspaces/MyWabacusProject/Person_Spending_Project/src/com/nasoft/jdbc
    <span style="color:#ff0000;">A</span> <span style="color:#6633ff;"><u>conflict in the working copy obstructs the current operation</u>
</span><span style="color:#ff0000;">svn: Commit failed (details follow):
svn: Aborting commit: 'E:\Program Files\MyEclipse 10\Administrator\Workspaces\MyWabacusProject\Person_Spending_Project\src\com\nasoft\jdbc' remains in conflict

</span>

commit -m "" E:/Program Files/MyEclipse 10/Administrator/Workspaces/MyWabacusProject/Person_Spending_Project/src/com/nasoft/jdbc
    <span style="color:#ff0000;">A</span> <span style="color:#6633ff;"><u>conflict in the working copy obstructs the current operation</u>
</span><span style="color:#ff0000;">svn: Commit failed (details follow):
svn: Aborting commit: 'E:\Program Files\MyEclipse 10\Administrator\Workspaces\MyWabacusProject\Person_Spending_Project\src\com\nasoft\jdbc' remains in conflict
</span>

 

 

原因可能是，本來有一個jdbc的包，后來修改后沒有提交上

解決方式如下：

 

然后點擊Finish —— 重新提交就OK啦