Closed ualch9 closed 1 year ago
Am I getting my terminology mixed up? I thought squash and merge
squashes everything into one commit, then merges the one-and-only-one commit. I'm fairly certain I clicked on squash and merge
...
Ok, never mind, I'm wrong. My mind has been in Bitbucket land, and I got trigger happy and just clicked on Confirm Merge
thinking I'd previously clicked Squash and Merge
. I now see that a squash and merge specifically says Confirm Squash and Merge
and a regular merge is just Confirm Merge
.
Reverts OneBusAway/onebusaway-ios#622