In order to keep git version history tidy, I think it makes sense to always rebase->merge or squash->merge, and disable the plain merge button in repo settings.
I'm happy with either options of rebase/squash, but would like to see us do our best to keep PRs tightly scoped if we only do squashes.
| example of tidy |
example of not tidy |
 |
 |