mine-full 和 theirs-full 命令的目的
问题说明
根据文档:
(mc) mine-conflict - 接受我的所有冲突的版本(相同)
(tc) 他们的冲突 - 接受他们的所有冲突的版本(相同)
(mc) mine-conflict - accept my version for all conflicts (same)
(tc) theirs-conflict - accept their version for all conflicts (same)
(mf) mine-full - 接受我的整个文件的版本(甚至非冲突)
(tf) theirs-full - 接受他们的整个文件版本(相同)
(mf) mine-full - accept my version of entire file (even non-conflicts)
(tf) theirs-full - accept their version of entire file (same)
我不明白 *-conflict 和 *-full 命令之间的区别.看起来它会给你同样的结果.
I don't understand the difference between the *-conflict and *-full commands. It seems like it would get you the same results.
更多:有关更详细的回复，请参阅此主题对这个问题.
More: See this thread for a more detailed response to this question.
正确答案
'conflicts' 版本将仅对冲突使用指定的副本，让正常的合并适用于任何其他更改.
The 'conflicts' version will use the specified copy for the conflicts only, letting the normal merge work for any other changes.
使用完整"版本将使用指定的整个文件，不考虑合并的结果.
Using the 'full' version will use the entire file as specified, disregarding the results of the merge.
http:///svnbook.red-bean.com/en/1.8/svn.tour.cycle.html#svn.tour.cycle.resolve
这篇好文章是转载于：学新通技术网
