[throwaway918299]

merge feature branches when reintegrating main, squash merge onto the main branch when you’re finished - best of both worlds imo

I never need to rebase, or unfuck a botched rebase or go reflog diving - and the commit history is linear where it matters.

[lmm]

Makes the history less useful for bisection - you'll always land on a squash merge rather than the specific commit that caused the problem.

[throwaway918299]

In practice that's never been a problem for me. Work is delivered in functional units and segmented "sections" of code are basically useless on their own for the purpose of debugging.