697
Merge conflicts (feddit.nl)
you are viewing a single comment's thread
view the rest of the comments
[-] morpheus17pro@lemmy.ml 13 points 5 days ago

European here. I'm a supporter of civil rights and against racism and so on, but that controversy with master vs main for me is just a silly us american controversy, as master has more meanings that just owner of a slave (and in this context, it's not even related to that master-slave thing as used to be in hardware naming).

The issue is that kind of (in my pov, unnecessary) change caused an outage in my company as some k8s objects changed its label because of this kind of controversy, and some of our selectors were not ready for that change, as iirc this happened in a minor version upgrade. We also had to invest development hours to update internal tooling to support that change too (and I bet, a lot of companies did the same).

[-] timbuck2themoon@sh.itjust.works 3 points 5 days ago

Agree with this. Never changed from master as it would cost the business money to do so (and involve a ton of headaches) for no reason. Thankfully the whole dept agreed on that.

this post was submitted on 31 Jul 2025
697 points (100.0% liked)

Programmer Humor

25495 readers
2057 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 2 years ago
MODERATORS