4

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

  • 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?
Community
  • 1
  • 1
Gil Sand
  • 5,802
  • 5
  • 36
  • 78

2 Answers2

4

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

From 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.
Xatenev
  • 6,383
  • 3
  • 18
  • 42
0

Sadly, if a file conflicts and you choose "resolve using theirs" for it, Git will replace the complete local file with theirs, instead of only the conflict lines.

Jeff T.
  • 2,193
  • 27
  • 32