I fight with this daily working on docs, and have never seen an merge issue in github or gitlab getting it wrong FWIW. Also the Update with merge commit" (the default) — merges

master

into the PR branch, creating a merge commit, also annoying since I have to go back and strip it off if I need to rebase anyway.