[CityOfThrowaway]

The best practice that I've seen done (and enjoy) is:

1. Always squash and merge 2. But have tidy commits 3. So your squashed commit has a useful list of what is in the commit