0
Согласно журналу ниже, я попытался сделать svn update, получил конфликт, ctrl-C d из него, а затем попытался сделать это снова. Никакой попытки разрешения конфликта во втором запуске, текст, который необходимо объединить, автоматически вставляется в исходный код. Зачем?Почему «svn update» пытается слить на Ctrl-C?
$ 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.
Итак, что ответ? :-) –