Git is very flexible, but you do have to know the magic incantations. For example, suppose you mess up a commit message — we never do that, of course, but just pretend.

In this example of how to squash git commits, the repository I’m using has three Git Flow compatible branches: master with one unmerged commit develop with five unmerged commits feature with three ...