697
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
697 points (100.0% liked)
Programmer Humor
25495 readers
2415 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
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