As per this question, I know it is possible to keep all changes that did not raise any conflict, while using their
changes 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 theirs
on 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?
It resolves the non conflicting changes and prefers
theirs
for conflicting ones. (The opposite forours
)From
man