This documentation was written to describe the 1.6.x series of Subversion. If you are running a different version of Subversion, you are strongly encouraged to visit and instead consult the version of this documentation appropriate for your version of Subversion.


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


svn resolve PATH...


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:


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.


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


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


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

See the section called “Resolve Any Conflicts” for an in-depth look at resolving conflicts.


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


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

$ svn update
Conflict discovered in 'foo.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    foo.c
Updated to revision 5.
Summary of conflicts:
  Text conflicts: 1
$ svn resolve --accept mine-full foo.c
Resolved conflicted state of 'foo.c'