I figured out with
svn resolve --accept working PATH_TO_FILE
which should end up with:
Resolved conflicted state of ‘PATH_TO_FILE’
I figured out with
svn resolve --accept working PATH_TO_FILE
which should end up with:
Resolved conflicted state of ‘PATH_TO_FILE’