4 ms·

I already said that it can be too expensive, but thanks for playing. <3 Also, a squash merge is not a merge. It's just another form of rebase. And if you ment

• lemoncucumber 9y ago
  My point was that many git users don't understand git all that well, and I think that encouraging everyone to rebase is a bad idea. If you're going to promote a particular workflow as the the one that "should be the weapon of choice," I think the workflow of merge-master-into-feature-branch, squash-merge-feature-branch-into-master is a more user friendly alternative, since then the cases where rebasing is expensive never even come up. And yes, you're right that I was remiss not to mention the --soft part. The git reset workflow is one that I would definitely not encourage people to do if they don't understand git well.