NguyenTrungTin
9/29/2019 - 5:20 AM

git merge strategy

git merge --strategy-option ours/theirs <branch>

or

git merge -s ours <branch>

and

git merge --strategy-option theirs <branch>
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.

https://stackoverflow.com/questions/10697463/resolve-git-merge-conflicts-in-favor-of-their-changes-during-a-pull