The reason I like the `--ff-only` is it avoid putting folks into conficts that might not understand them. That said, they're on the shell in the first place, and they could always redefine it. I'm okay sticking with `merge` if you like it better.