When I have a PR without conflicts I can Squash to create a new commit from branch origin and just send that one commit to destination branch so if I revert I don't have all the commits made in branch origin. I want the same strategy but with conflicts in a PR..