The nightmare that is squash merge ft Github

Squash merging causes merge conflicts after PRs are merged. Learn why this happens and how to fix it with interactive rebase—plus an automated git alias that drops merged commits with a single command, saving you from repetitive conflict resolution.