If you get the svn error “svn: Aborting commit: abc remains in conflict”, there are a few things you can do to alleviate the problem.
$ svn commit -m “Add a few more things”
svn: Commit failed (details follow):
svn: Aborting commit: ‘/home/admin/svn-work/example.txt’ remains in conflict
If you get a conflict, you need to do one of three things:
* Merge the conflicted text “by hand” (by examining and editing the conflict markers within the file).
* Copy one of the temporary files on top of your working file.
* Run svn revert
Once you’ve resolved the conflict, you need to let Subversion know by running svn resolved. This removes the three temporary files and Subversion no longer considers the file to be in a state of conflict.
$ svn resolved example.txt
Resolved conflicted state of ‘example.txt’
Finally, once you’re done, you can commit your changes again.
