In my experience, multiple concepts invariably end up in a non-trivial PR. When a repository uses squash-and-merge then those concepts end up in the same single commit on main and any context is lost.
@rob I think squash and merge is a good default policy for PRs as you can do fix-up commits without needing to rebase, force push, and confuse the reviewer to make sure the requested changes went through.
But, sometimes rebasing the PR and merging it as multiple commits is the best way to go.
Add comment