So, this is how my morning went.
Apologies to my reviewers for all the notification emails they’re receiving during this battle with the CI/CD build.
Leon Mika It took 14 commits, but the battle's finally won. Now to hide evidence of the struggle by squashing all these into a single commit. 🥸
Just kidding: merging the MR will squash them anyway.
Chris Verbree out of curiosity, du you generally squash all your mr down to a single commit? I tried this for a while, but when I ever need to search a bug if find it quite unhandy to have lost the single commits inbetween from developing the feature. But having a single linear history on main would be so nice. Compared to the mess I usually get. I also sometimes wondered whether it is just a sign of my features being too big.
Leon Mika @V_ Yes, I tend to squash my commits before I raise a MR. I was once on a team that strongly encouraged us to do so, so that once we merged our history would be relatively tidy. We weren't squashing when we merged back then though, unlike the team I'm on today. So I probably don't need to squash, but there are some benefits from doing so, like when rebasing recent changes from main, I only have to resolve conflicts on one commit. Other than that, it's just habit.