This text is a work in progress—highly subject to change—and may not accurately describe any released version of the Apache™ Subversion® software. Bookmarking or otherwise referring others to this page is probably not such a smart idea. Please visit http://www.svnbook.com/ for stable versions of this book.
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 the conflicted item with the version specified
(interactively or via 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.”
See the section called “Resolve Any Conflicts” for an in-depth look at resolving conflicts.
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 Updating '.': 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' $