为什么';svn更新';是否尝试在Ctrl-C上合并?
根据下面的日志,我尝试执行为什么';svn更新';是否尝试在Ctrl-C上合并?,svn,Svn,根据下面的日志,我尝试执行svn更新,遇到冲突,ctrl-Cd退出,然后再次尝试。在第二次运行时未尝试解决冲突,将要合并的文本自动插入到源中。为什么? $ 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)
svn更新
,遇到冲突,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.
SVN中的冲突发生在您使用过时版本的文件时,或者其他人使用同一文件时,提交更改,并且当您尝试更新时发生冲突。
如果您的SVN客户端有合并文件的工具,您可以手动解决冲突,如果没有,您可以将整个项目下载到其他文件夹中,并将文件合并到新项目中。那么,答案是什么?:-)