svn resolved — Deprecated. Remove “conflicted” state on working copy files or directories.
This command has been deprecated in favor of running svn resolve
--accept working
. See svn resolve in the preceding section for details.PATH
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 第 4.5 节 “解决冲突” for an in-depth look at resolving
conflicts.
如果你在更新时得到冲突,你的工作副本会产生三个新的文件:
$ svn update C foo.c Updated to revision 31. Summary of conflicts: Text conflicts: 1 $ ls foo.c* foo.c foo.c.mine foo.c.r30 foo.c.r31 $
当你解决了foo.c
的冲突,并且准备提交,运行svn
resolved让你的工作副本知道你已经完成了所有事情。
警告 | |
---|---|
你可以仅仅删除冲突的文件并且提交,但是svn resolved除了删除冲突文件,还修正了一些记录在工作副本管理区域的记录数据,所以我们推荐你使用这个命令。 |