提交冲突代码
commit -m "" E:/Program Files/MyEclipse 10/Administrator/Workspaces/MyWabacusProject/Person_Spending_Project/src/com/nasoft/jdbc A conflict in the working copy obstructs the current operation 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
原因可能是,本来有一个jdbc的包,后来修改后没有提交上
解决方式如下:
然后点击Finish —— 重新提交就OK啦
svn提示出错异常为remains in conflict,布布扣,bubuko.com
原文:http://blog.csdn.net/xiaokui_wingfly/article/details/23253193