Replies from 7 April 2021

Hmm I'll have to try it but I thought rebase-merge was the same as a --no-ff merge

You can also do this with a "rebase merge" on GitHub, and yep would recommend it if you don't want merge commits. I'd generally say keep them, but amend the titles to be ie PR title

Glad you found it, this one has bitten me before, too 😂