Force git always choose a newer version during merge?

Question

Suppose I am merge git and there is a merge conflict.

My question is: how can I get git to always choose a newer version of the code in the conflict, so I won’t have to resolve the conflict manually?

Answer 1

This is not a completely new version, but you can say that git always prefers the version in the current branch using git merge branch -X ours or prefers the version of the branch to be merged using git merge branch -X theirs .

From man git-merge :

our:

This parameter causes conflicting chunks to be automatically resolved using our version. Changes from another tree that do not conflict with our side are reflected in the result of the merger. For a binary file, all content is taken from our side.

them

This is the opposite of "ours."

Answer 2

I use this

 git fetch --prune git reset --hard origin/master