Unix in a Nutshell, 4th Edition

Name

resolved

Synopsis

svn resolved path ...

Remove the “conflicted” state on working copy files or directories. This command 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.” Use it after you have resolved the conflict in the file.

Alternate Names:	None
Changes:	Working copy
Accesses Repository:	No

Options

--config-dir dir	--recursive (-R)
--quiet (-q)	--targets filename

Example

If you get a conflict on an update, your working copy will contain three additional files:

    $ svn update
    C  foo.c
    Updated to revision 31.
    $ ls
    foo.c                  Merged version with conflict markers
    foo.c.mine             Original working copy version
    foo.c.r30              Unmodified BASE version
    foo.c.r31Unmodified HEAD version

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.

Warning

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 you should use this command.