merge - Using git, how to do a 'use theirs' during a conflict? -

With GIT, how do I command "their" type branch merge? This order should only be overwritten with your native version as well as the original version.

To change your master with the master of origin:

  $ Git checkout master $ git branch - m master old-master $ git checkout --track -b master origin / master  

Our resolves any of the many prominent ones, but the result of the merge is always the current branch Is prominent. It is used to eliminate past development history of party branches.

If you want a remote branch to win, then create a tracking branch, check it, and git merge-s our ... from there .