Diff to the common ancestor (like github and bitbucket)

   git diff master... < common ancestor

Merge but always resolve towards the branch merging in

git merge –strategy-option theirs master