git merge: keep one side for some files, manual merge the rest

In a merge with conflicts, is there a way to tell git to keep one version for a set of files?

$ git checkout some_branch
$ git merge origin/master
$ ?