You could allow commits in the same PR that must all go together, and then squash them before you merge