this post was submitted on 01 Mar 2024
19 points (100.0% liked)

Git

2828 readers
1 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
[–] [email protected] 2 points 6 months ago* (last edited 6 months ago) (1 children)

Doesn't squashing on merge achieve exactly the same thing? (As long as pull requests are kept small, of course.)

[–] [email protected] 1 points 6 months ago (1 children)

To a degree, if pull requests are small enough, then yes.

Often, a changeset includes different aspects and concerns though, and individual commit messages allow you to document and reason them. Squashing makes you lose the concern separation.

When reviewing, even relatively simple changes separated into their concerns helps me a lot.

It's a matter of preference and necessity, and the changeset and it's environment at hand.

[–] [email protected] 0 points 6 months ago

Not squashing before review, squashing on merge (i.e. after review). Squashed merges make these easy, regardless of whether the original commits in the pull request were messy:

  • determining what changed between versions
  • finding and reverting regressions