Remove the conflicted state on working-copy files or directories. This command does not semantically resolve conflict markers; instead it replaces path and then removes conflict-related artifact files. Use the --accept argument to specify what version to use when replacing path. This command allows path to be committed again by telling Subversion that the conflicts have been resolved. Use it after you have resolved the conflict in the file. You can pass the following arguments to the --accept option:
Alternate names: none
Changes: working copy
Accesses repository: no
If you get a conflict on an update, your working copy will contain three additional files:
svn updateConflict discovered in 'foo.c'. Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: p C foo.c Updated to revision 31 $
svn resolve --accept mine-full foo.cResolved conflicted state of 'foo.c'
You can just remove the conflict files and commit, but svn resolve fixes up some bookkeeping data in the working-copy administrative area in addition to removing the conflict files, so you should use this command.