I think “squash” is a good option for PR with the understanding that some specific changes should be handled manually by a maintainer with a rebase & push to master