3 ms·
Squash isn't for linear history. That's the rebase vs merge-master-downstream debate. Squash is for getting your wip commits out of history, that kind of thing.
by hashkb 11y ago
Squash isn't for linear history. That's the rebase vs merge-master-downstream debate. Squash is for getting your wip commits out of history, that kind of thing.
- teacup50 11y agoMany of us believe there's no such thing as a throw-away "WIP" commit, and if there is, the work should be better broken up and managed by the developer so that they're committing fully considered incremental progress. The easiest time to catch a bug is when it's hiding in a 10 line diff, especially before you commit it. It gets progressively more difficult as the scope of the changeset grows.