Version Control with Subversion, 2nd Edition

Name

svn resolve — Resolve conflicts on working copy files or directories.

Synopsis

svn resolve PATH...

Description

Resolve “conflicted” state on working copy files or directories. 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.” You can pass the following arguments to the --accept command, depending on your desired resolution:

base

Choose the file that was the BASE revision before you updated your working copy—that is, the file that you checked out before you made your latest edits.

working

Assuming that you’ve manually handled the conflict resolution, choose the version of the file as it currently stands in your working copy.

mine-full

Resolve all conflicted files with copies of the files as they stood immediately before you ran svn update.

theirs-full

Resolve all conflicted files with copies of the files that were fetched from the server when you ran svn update.

See Resolve Conflicts (Merging Others’ Changes) for an in-depth look at resolving conflicts.

Alternate names

None.

Changes

Working copy.

Accesses repository

No.

Options

--accept ARG
--depth ARG
--quiet (-q)
--recursive (-R)
--targets FILENAME

Examples

Here’s an example where, after a postponed conflict resolution during update, svn resolve replaces all the conflicts in file foo.c with your ...