I prefer fast-forward-capable but with a merge commit. That way logically grouped commits still have a grouping (the merge commit) but bisection is still plausible.

Sep 3, 2020 ยท 3:03 PM UTC
This tweet is unavailable
I tend to work on projects where branches have many commits (5+) so the merge commits give useful context