this post was submitted on 19 Jul 2024
39 points (95.3% liked)

Git

2882 readers
3 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
[–] sukhmel@programming.dev 0 points 4 months ago

Merge requests should be rather small to make it easier to review.

With this I wholeheartedly agree

if your work warrants multiple commits, then it probably also warrants multiple merge requests.

With this not so much, but if you keep your merge requests so small, squashing them is no big deal, that's a good counterexample for my previous point.

another good thing is that when we decide to release, we can easily look through the commit history for a change log. No more sifting through minor fixes commits.

That still requires you to write meaningful messages, just a bit rarer. We do have trouble with change logs, but we had exact same problems when people squashed left and right. Maybe squashing helps self-discipline, though, I haven't thought about it that way