What is the default behaviour of “Resolve using theirs” in git

As per this question, I know it is possible to keep all changes that did not raise any conflict, while using theirchanges for the conflicting changes.

What I would like to know is, when using SourceTree (or, if relevant, any git tool or even the command line), what is the default behaviour when choosing Resolve using theirson a single file (or even the complete merge).

  • Git: How to connect SourceTree to my Git-Enabled-Web-Hosting via SSH?
  • Atlassian SourceTree custom action contrast
  • How can I rebase multiple branches at once?
  • How to make an existing branch track a remote branch?
  • Finishing a feature branch with GIT Flow
  • Authenticating SourceTree with a Google Code project
    • Does it simply replace the complete local file with whatever is in the remote ?
    • Does it keep all the local non conflicting changes and only use theirs for all the conflicts?

  • Git smudge filter
  • What is the best way to back up an entire git repository on external disk?
  • Differences between git branches using Visual Studio
  • Get sha of the last commit before pull
  • Windows scheduled task to git push to github
  • git rebase and keep all child branches
  • One Solution collect form web for “What is the default behaviour of “Resolve using theirs” in git”

    It resolves the non conflicting changes and prefers theirs for conflicting ones. (The opposite for ours)

    From man

        >>> 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.
        This is opposite of ours.
    Git Baby is a git and github fan, let's start git clone.