svn resolve — Resolve conflicts on working copy files or directories.
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 “解决冲突(合并别人的修改)”一节 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 up
Conflict discovered in 'foo.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: p
C foo.c
Updated to revision 5.
$ svn resolve --accept mine-full foo.c
Resolved conflicted state of 'foo.c'