It’s Poe’s law

I post my ignorant opinions somewhere. There’s always someone who will correct me with correct information.

I’m sure they had loads of fun writing this.

Microsoft has nothing to do with this. This is entirely on Crowdstrike.

Git rebase can be hard to understand for many. Not everyone has the blessing of being in a team of Git gurus.

I think squashing is great and I would never want to go back. It helps ensuring:

• All commits in main have useful messages. No more “fix pipeline errors”, “fix MR comments”, etc.
• Ensures pipeline has been successful with all commits in main. No need to guess which commits will build and won’t build.
• Easy to revert commits.
• Eliminates incompressible history because someone had a bad day with git.
• Encourages frequent commits. No need to ensure all commits are perfect and good in their own right. Commit when you want to commit even if it’s incomplete work.

And IMO, if your work warrants multiple commits, then it probably also warrants multiple merge requests. Merge requests should be rather small to make it easier to review.

Edit: 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.

I don’t like stash for this purpose. What if I have to jump to a different branch a second time? Should I stash again?

It can be difficult to know which stash belongs to which branch. Nah, I rather just commit so I don’t need to bother with that confusion.

I’m aware of that option. I haven’t bothered to learn it because this is a perfectly good system for me.

Often I commit because I have to jump to another branch, so I want to save my progress. This means I can be in the middle of something, so I write a trash message.

All those messages will disappear anyway after the merge request, because we use a squash policy. I can spend more time thinking of a more proper commit message when writing the merge request.

The post mentions that these are for commits in a merge request before squash. When they’re squashed a proper message is given.