DEV Community

Discussion on: What is your git merge strategy?

ozzyogkush profile image
Derek Rosenzweig

Take it on a case-by-case basis but typically I'd rather not auto-squash anything unless it only handles commit messages explicitly prefixed with fixup! or squash!. If a feature has multiple commits, I tend to believe it's because the developer did the work in logical stages that are separate enough to be units of work that could possibly get reverted independently of the rest of the changes in the branch.

Certainly have your developers do any final interactive rebasing and manual squashing/fixing up before merging the pull request though.