svn提示出错异常为remains in conflict

提交冲突代码

 

[java] ​​view plain​​ ​​copy​​

​​print​​​​?​​

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