Rebasing fixes all of the problems for which you present squash merges as the only solution.