svn代码冲突

转自：https://blog.csdn.net/pengweid/article/details/49821117

svn代码提交报以下错误，错误原因： 【MenuUCCImpl】 代码冲突

org.tigris.subversion.javahl.ClientException: Merge conflict during commit

svn: Commit failed (details follow):
svn: File or directory ‘MenuUCCImpl.java‘ is out of date; try updating
svn: resource out of date; try updating

org.tigris.subversion.javahl.ClientException: Merge conflict during commit
svn: Commit failed (details follow):
svn: File or directory ‘MenuUCCImpl.java‘ is out of date; try updating
svn: resource out of date; try updating
---------------------

svn代码冲突

原文：https://www.cnblogs.com/sharpest/p/11314576.html