710
Merge conflicts (feddit.nl)
you are viewing a single comment's thread
view the rest of the comments
[-] gibson@sopuli.xyz 24 points 3 days ago
[-] Dave@lemmy.nz 52 points 3 days ago

Can we get a meme about calling it main, effectively master but not granting it the title of master? That's where I thought this one was going.

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

Same here. Though it makes sense as we also cut a “release” branch that aid what goes to production and it’s behind protections against rogue PRs/commits so devs can’t just push there, the process must be followed. “Main” is for devs. “Release” is for prod. “Master” didn’t really jive with that layout so it’s gone.

[-] eager_eagle@lemmy.world 7 points 3 days ago* (last edited 3 days ago)

similarly, I use master and stable, it helps that PRs default to master, making changes to stable more intentional.

[-] eager_eagle@lemmy.world 1 points 3 days ago

I'm glad I'm not part of "we"

[-] koper@feddit.nl 13 points 3 days ago
[-] eager_eagle@lemmy.world 4 points 3 days ago

Because this whole discussion is fucking stupid. There was no good reason for a change.

[-] last_philosopher@lemmy.world 3 points 2 days ago

It's shorter. Also "master" is especially egregious as as it requires the last 5 letters to be typed with the same hand, while "main" makes better use of bimanual parallelism.

[-] SqueakyBeaver@lemmy.blahaj.zone 11 points 3 days ago

I like the actual look of the word "main" more than I do the word "master". I think it's because it looks like a neat semi-circle

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

It also makes more sense.

[-] TrickDacy@lemmy.world 5 points 3 days ago

You doth protest too much. Wonder why

[-] limer@lemmy.ml 11 points 3 days ago

Because the argument is stupid. Much like pointers not being a good term to use because it’s rude to point. Or man pages being sexist.

[-] rainwall@piefed.social 5 points 3 days ago* (last edited 3 days ago)

I've never heard that pointer bullshit at all. Can you link it?

"Man" for "manual" is just an antiquated term kept around by Unix curmudgeons. "Help" is much better as it requires no explanation and conveniently is automatically abbreviated to its full name. It's the common term used in most other systems that aren't linux.

'Man" isn't sexist, it just sucks.

[-] zarkanian@sh.itjust.works -4 points 3 days ago

The good reason was that it bothered some people. "Main" is two fewer letters, so it's even more convenient to type. So what's the problem?

[-] morpheus17pro@lemmy.ml 10 points 3 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 2 points 2 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.

[-] zarkanian@sh.itjust.works 0 points 3 days ago

This is the way.

this post was submitted on 31 Jul 2025
710 points (98.4% liked)

Programmer Humor

25448 readers
994 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