0
点赞
收藏
分享

微信扫一扫

svn提示出错异常为remains in conflict


提交冲突代码


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的包,后来修改后没有提交上

svn提示出错异常为remains in conflict_.net

svn提示出错异常为remains in conflict_svn_02

解决方式如下:

svn提示出错异常为remains in conflict_remains in conflict_03


然后点击Finish —— 重新提交就OK啦


举报

相关推荐

0 条评论