svn error "svn: Aborting commit: xxx remains in conflict"?

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