概要

svn resolved PATH...

描述

This command has been deprecated in favor of running svn resolve --accept working. See svn resolve for details.

Remove “conflicted” state on working copy files or directories. This routine 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.” See “解决冲突(合并别人的修改)”一节 for an in-depth look at resolving conflicts.

别名

无

改变

工作拷贝2

是否访问版本库

否

选项

--targets FILENAME
--depth ARG
--accept ARG
--quiet (-q)
--config-dir DIR

例子

如果你在更新时得到冲突，你的工作拷贝会产生三个新的文件：

$ svn update
C  foo.c
Updated to revision 31.
$ ls
foo.c
foo.c.mine
foo.c.r30
foo.c.r31

当你解决了foo.c的冲突，并且准备提交，运行svn resolved让你的工作拷贝知道你已经完成了所有事情。