Theirs on top
git pull -s recursive -X theirs <remote> <branch>
git merge -s recursive -X theirs <branch>

My on top
git pull -s recursive -X ours <remote> <branch>
git merge -s recursive -X ours <branch>