I think GitHub is half the problem with how people perceive Git. There are friction points between how Git works and how GitHub wants to do them. Rebase is a

I think GitHub is half the problem with how people perceive Git. There are friction points between how Git works and how GitHub wants to do them. Rebase is a nice compromise between merge which makes reading history and hard and squash which loses intermediate commits (sometimes breaking rename detection). But of course you cannot include a reference to the PR anymore outside the GitHub UI or manually rewriting commits. Similarly having the type of merge be treated as a last second choice instead of part of the reviewable flow increases "wrong button" incidents a lot.