My New Best Friend: git merge --no-ff