How to Solve SVN error "svn:aborting commit:xxx remains in conflict"?

Encounter problems

$ sudo svn commit-m '
Svn:E155015:Commit failed (details follow):
Svn:E155015:Aborting commit: '/users/mac/data/lz/core/lz.php ' remains in conflict

Workaround 1:

$ sudo svn resolved /users/mac/data/lz/core/lz.php
Resolved conflicted state of ' core/lz.php '

$ sudo svn commit-m '
... ...
Transmitting file Data ...

It worked!

Workaround 2:

1. Merge conflict text " hand "(by reviewing and editing conflict flags within the document).
2. Run svn revert to throw away all your local modifications.

Once you have resolved the conflict,

You need to let subversion know by ordering SVN resolved.

Subversion will not assume that this file is in a conflict state.

How to Solve SVN error "svn:aborting commit:xxx remains in conflict"?