That sounds horrible, squash -> rebase -> fast-forward merge... Much more easier to reason about the commits/changes. Git bisect is really important in some ca

That sounds horrible, squash -> rebase -> fast-forward merge... Much more easier to reason about the commits/changes. Git bisect is really important in some cases and that needs all/most commits to be compilable..., especially big merge commits. Unless you have a special reason to preserve all commits as they were made (eg. signed commits), in that case go with the linux model of small single responsibility merges that preferably have no conflicts...