1、现象
svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/Users/xxx/xxx.java' remains in conflict
2、解决
$ sudo svn resolved /Users/xxx/xxx.java
Resolved conflicted state of 'xxx/xxx.java'
3、命令重新上传,也可以通过编辑器上传
$ sudo svn commit -m '/Users/xxx/xxx.java'
Transmitting file data