Use patience strategy for merging

Supposed to be a bit better: https://www.kernel.org/pub/software/scm/git/docs/git-merge.html