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).

  • How to handle passwords in shared code
  • Can I move a local Git repository to elsewhere within my hard drive safely?
  • How do you search for a branch in SourceTree
  • What happens to local code when we try to switch the branch in the sourcetree?
  • errors while committing the repository in sourcetree, Git window client
  • For bitbucket, what is the difference between having a team work on a repo and having a personal repo that everyone on the team works on?
    • 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?

  • github add <<<<<<< HEAD
  • Get topic branch from gerrit
  • Overwrite local changes in Git
  • Git post-receive hook loop though all commits
  • When someone has cherry-picked from my git commits and made commits of their own, how do I merge?
  • Add a git merge driver to the repository?
  • 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.