Purpose of the mine-full and theirs-full commands

前端 未结 2 1766
名媛妹妹
名媛妹妹 2020-12-23 14:46

According to the docs:

(mc) mine-conflict - accept my version for all conflicts (same)
(tc) theirs-conflict - accept their version for all conf

相关标签:
2条回答
  • 2020-12-23 14:59

    mine-conflict will use your code in every conflict situation, but still do regular merging in all other situations.

    mine-full will use your entire file, throwing away all changes in theirs.

    0 讨论(0)
  • 2020-12-23 15:11

    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

    0 讨论(0)
提交回复
热议问题