"I do all my changes on the `..." <- > <@thejpster:matrix.org> I do all my changes on the `develop` branch, then cut a release branch off that which gets merged into `main`. The `main` branch is tagged, and then backported on to `develop`. This means `main` only has a series of merge commits, each corresponding to a release. > > However, github merge queues don't do merge commits, they just rebase all the changes over onto `main`, which makes a huge mess and I have to turn off force-push protection so I can put things back as they were. > > You'll probably tell me I'm just holding it wrong, but I quite like my process. Have you set ghmq to just do rebases? Whether it merges, rebases, or squashes to a single new commit is an option in settings