Finding the 'missing' merge commit

Whoops! I like to squash commits whenever I merge a pull request into the main branch to keep the history as linear and simple as possible. I would normally set this policy on the repository and not think about it ever again. However, today I accidentally merged a pull request with a merge --no-ff policy since I assumed the default was set to squash, but it was not… So what just happened?...

May 18, 2023 · 5 min