svn: E155015: Aborting commit: remains in conflict

在IDEA上使用svn提交代码时报错，先看下完整的报错信息

Commit failed with error
0 files committed, 15 files failed to commit: add getDetailPostById PostController api
AND
change prod file parameter
svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: 'D:\workspace\cloud_platform\src\main\java\com\luntek\cloudplatform\mapper\PostMapper.java' remains in conflict

---

分析

报错内容可知是在提交文件是PostMapper.java文件出现冲突，所以将冲突文件合并即可。

---

解决

1.鼠标右键点击项目根目录 --> 2.选择 subversion --> 3.resolve Text Confict --> 4.merge

手动编辑冲突部分，解决后就能正常提交了。