Squash git commits when merging

1 · Ariejan de Vroom · Aug. 17, 2016, midnight
Today I’ve been fighting to get our test suite to run against a newly delivered Oracle 12 database. Of course, that didn’t work out of the box, so there was some debugging, trial-and-error, and cursing involved. Finally, I managed to get the build back up and running. Yay! The commit history for this pull request was horrible and some would call it unprofessional, looking at the various commit messages written in anger. Normally I’d squash all commits together using rebase in the feature branch ...