728
Merge conflicts
(feddit.nl)
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 31 Jul 2025
728 points (98.4% liked)
Programmer Humor
26046 readers
2369 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
- Keep content in english
- No advertisements
- Posts must be related to programming or programmer topics
founded 2 years ago
MODERATORS
We use main now
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.
Same
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.
similarly, I use
masterandstable, it helps that PRs default tomaster, making changes tostablemore intentional.I'm glad I'm not part of "we"
Why do you care
Because this whole discussion is fucking stupid. There was no good reason for a change.
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
It also makes more sense.
You doth protest too much. Wonder why
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.
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.
What's stupid is that people like you argue about a branch name instead of just cede the point as if it costs anyone anything to
Actually this cost a lot of time and money. Even today I have to take an extra step to see if master or main is use . Before it was standard.
Curse this
If this was hard for your company to change, you did things wrong. I work with git everyday and I've no idea what extra step you mean. Git software of all stripes will show you front and center what branches exist and what's default. People pissed about this just wanna whine and they can downvote me a million times if they want
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.
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?
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).
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 is the way.