[aib]

My default pull is ff-only. I don't like merging or rebasing by default.

When working in a short-lived branch, I like to rebase. I usually get no or simply easy-to-solve conflicts. I like my small and numerous commits stacked on top of the current develop. Regardless or whether we squash or not.

For long-lived branches (and technically for hard merges, though I've been using rerere more and more) merge is a better option.

What kills bisect, IMO, is large commits or commits with multiple subjects/goals. That's the reason I don't like squashed PRs.