SVN tutorial n 14 - resolve

The svn "resolve" command resolves the “conflicted” state on working copy files or directories. The synopsis is:

 svn resolve <path>

This routine does not semantically resolve conflict markers; however, it replaces <path> with the version specified by the "--accept" argument and then removes conflict-related artifact files. This allows <path> to be committed again that is, it tells Subversion that the conflicts have been “resolved.”
Example:
Using the same example used in [1]

> svn update
 Updating '.':
 C    MyFile.txt
 Updated to revision 31.
 Summary of conflicts:
 Text conflicts: 1

After a postponed conflict resolution during update, svn resolve replaces the all conflicts in file MyFile.txt with your edits:

> svn resolve --accept mine-full MyFile.txt

Link

[1] http://informaticaamodomio.blogspot.com/2016/11/svn-step-13-resolved.html