• 0 Posts
  • 8 Comments
Joined 1 year ago
cake
Cake day: July 3rd, 2023

help-circle




  • Commits should be reasonably small, logical, and atomic. MRs represent a larger body of work than a commit in many cases. My average number of (intentionally crafted) commits is like 3-5 in an MR. I do not want these commits squashed. If they should be squashed, I would have done so before making the MR.

    People should actually just give a damn and craft a quality history for their MRs. It makes reviewing way easier, makes stuff like git blame and git bisect way more useful, makes it possible to actually make targeted revert commits if necessary, makes cherry picking a lot more useful, and so much more.

    Merge squashing everything is just a shitty band-aid on poor commit hygiene. You just get a history of huge, inscrutable commits and actively make it harder for people to understand the history of the repo.


  • It wasn’t all sunshine and rainbows. I remember losing hundreds of hours of progress on games due to memory card corruption. Or game cartridges/CDs no longer working, requiring you to buy a new copy. Or consoles getting straight-up bricked.

    Hell, a ton of people have memories of blowing into N64/SNES cartridges to get them to work since they had notoriously unreliable connectors. But even though it was something that didn’t work great, everybody has fond memories of doing it since there wasn’t this amalgamation of voices from every direction telling you to be upset about it and clamoring for retribution. If something was broken, you got frustrated about it, complained to your friends, and then moved on with your life since there wasn’t anything else you could do.