svn resolved — Remove “conflicted” state on working copy files or directories.
Remove “conflicted” state on working copy
files or directories. This routine does not semantically
resolve conflict markers; it merely removes
conflict-related artifact files and allows
PATH to be committed again;
that is, it tells Subversion that the conflicts have been
“resolved”. See the section called “Resolve Conflicts (Merging Others' Changes)” for an in-depth look at
If you get a conflict on an update, your working copy will sprout three new files:
$ svn update C foo.c Updated to revision 31. $ ls foo.c foo.c.mine foo.c.r30 foo.c.r31
Once you've resolved the conflict and
foo.c is ready to be committed, run
svn resolved to let your working copy
know you've taken care of everything.
You can just remove the conflict files and commit, but svn resolved fixes up some bookkeeping data in the working copy administrative area in addition to removing the conflict files, so we recommend that you use this command.