1.鼠标右键点击项目根目录 --> 2.选择 subversion --> 3.resolve Text Confict --> 4.merge
手动编辑冲突部分,解决后就能正常提交了。
摘自: https://blog.csdn.net/sinat_36710456/article/details/81511000
1.鼠标右键点击项目根目录 --> 2.选择 subversion --> 3.resolve Text Confict --> 4.merge
手动编辑冲突部分,解决后就能正常提交了。
摘自: https://blog.csdn.net/sinat_36710456/article/details/81511000
转载于:https://www.cnblogs.com/xinruyi/p/11072131.html