git中“解析使用他们”的默认行为是什么？

 

根据这个问题，我知道可以保留所有没有引起任何冲突their变更，而对冲突变更使用变更。

我想知道的是，在使用SourceTree（或相关的任何git工具或甚至命令行）时，在单个文件（甚至是完整合并）上选择Resolve using theirs默认行为是什么。

  • 它是否简单地用远程中的任何内容替换完整的本地文件？
  • 它把所有的地方非冲突的更改，并只使用theirs所有的冲突？

    • 它解决了无冲突的改变，喜欢theirs的相互冲突的。 （ ours的对面）

    从man 

    ours
    >>> This option forces conflicting hunks to be auto-resolved cleanly by 
    >>> favoring our version. Changes from the other tree that do not 
    >>> conflict with our side are reflected to the merge result.

    This should not be confused with the ours merge strategy, which does 
    not even look at what the other tree contains at all. It discards 
    everything the other tree did, declaring our history contains all that
    happened in it.

theirs
    This is opposite of ours.
    链接地址: http://www.djcxy.com/p/45031.html

    上一篇: What is the default behaviour of "Resolve using theirs" in git

    下一篇: How do you get a Git merge to ignore conflicts in selected files?