How to automatically resolve merge conflicts by selecting the remote version in Git?

Question

Is there any way to specify to git to automatically resolve the conflicts for a pack of files by taking the remote version for each of them? For instance, to take the remote

Answer 1

You can use recursive strategy (-s) with theirs option (-X). That is:

git merge -s recursive -X theirs source_branch