Never squash when merging. More details here: https://medium.com/@mlntdrv/about-the-importance-of-the-way-you-check-your-code-in-version-control-ac5c0391e851