You can squash after rebasing or merge a PR without squashing.