News for hackers. Stuff that matters.
Re:Twenty Years Is Nothing by kbolino on Monday March 04, 2024 @12:42PM (#39593362)
Rebasing can do a lot more things than just squashing.

I personally hate seeing dozens of semantically meaningless pull-merge commits ("merged branch main into main"). I don't care when you pulled or what effect it had on your local history. When you push, push a clean linear history starting from where other people left off. If you spend too much time working independently on a "branch" (your version of main diverging from everyone else's version of main), then you're not collaborating and you're not continuously integrating your work.

I do like the idea of being able to compress the history you're squashing, though. There can be a lot of trivial commits, but depending on workflow, squash-merge can hide subtle things like the reason you made a very important one line change.

There are no comments on this comment yet.