Rebase and merge pull requests
This strikes me as perhaps the worst merge method possible for git. Sometimes people call your main branch soup, and this will make that an incredibly accurate description.<p>People are bizarrely terrified of merge commits.