> or you add another commit, which essentially forces you to squash when you merge, which results in large commits. Please no. Just do a normal merge instead

> or you add another commit, which essentially forces you to squash when you merge, which results in large commits. Please no. Just do a normal merge instead of destroying history. Having those as separate commits is extremely useful for those of us who actually have had to dig into the history to track down why something is the way it is.