Question

根据下面的日志，我尝试svn update，发生冲突，ctrl-C d，然后尝试再次执行此操作。在第二次运行时没有尝试冲突解决，要合并的文本自动插入到源中。为什么？

$ svn update

Summary of conflicts:
  Text conflicts: 1
Conflict discovered in file 'myFileName'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
        (mc) my side of conflict, (tc) their side of conflict,
        (s) show all options: s 

  (e)  - change merged file in an editor  [edit]
  (df) - show all changes made to merged file
  (r)  - accept merged version of file  [working]

  (dc) - show all conflicts (ignoring merged version)
  (mc) - accept my version for all conflicts (same)  [mine-conflict]
  (tc) - accept their version for all conflicts (same)  [theirs-conflict]

  (mf) - accept my version of entire file (even non-conflicts)  [mine-full]
  (tf) - accept their version of entire file (same)  [theirs-full]

  (m)  - use merge tool to resolve conflict
  (l)  - launch external merge tool to resolve conflict  [launch]
  (i)  - use built-in merge tool to resolve conflict
  (p)  - mark the conflict to be resolved later  [postpone]
  (q)  - postpone all remaining conflicts
  (s)  - show this list (also 'h', '?')
Words in square brackets are the corresponding --accept option arguments.

Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
        (mc) my side of conflict, (tc) their side of conflict,
        (s) show all options: ^Csvn: E155027: Unable to resolve conflicts on 'myFileName'
svn: E200015: The operation was interrupted

$ svn update
Updating '.':
At revision 95171.

Answer 1

当您使用过时的文件版本时，SVN中的冲突发生，也许其他人在同一个文件中工作，提交更改，当您尝试更新时，存在冲突。如果您的SVN客户端有合并文件的工具，您可以手动解决冲突，如果没有，您可以将整个项目下载到其他文件夹中并合并新项目中的文件。

为什么'svn update'尝试在Ctrl-C上合并？

1 个答案: