Locking comments. Had a good run, over half a day, but this was always headed for an emotional train wreck.
linuxmemes
Hint: :q!
Sister communities:
Community rules (click to expand)
1. Follow the site-wide rules
- Instance-wide TOS: https://legal.lemmy.world/tos/
- Lemmy code of conduct: https://join-lemmy.org/docs/code_of_conduct.html
2. Be civil
- Understand the difference between a joke and an insult.
- Do not harrass or attack users for any reason. This includes using blanket terms, like "every user of thing".
- Don't get baited into back-and-forth insults. We are not animals.
- Leave remarks of "peasantry" to the PCMR community. If you dislike an OS/service/application, attack the thing you dislike, not the individuals who use it. Some people may not have a choice.
- Bigotry will not be tolerated.
3. Post Linux-related content
- Including Unix and BSD.
- Non-Linux content is acceptable as long as it makes a reference to Linux. For example, the poorly made mockery of
sudo
in Windows. - No porn, no politics, no trolling or ragebaiting.
4. No recent reposts
- Everybody uses Arch btw, can't quit Vim, <loves/tolerates/hates> systemd, and wants to interject for a moment. You can stop now.
5. π¬π§ Language/ΡΠ·ΡΠΊ/Sprache
- This is primarily an English-speaking community. π¬π§π¦πΊπΊπΈ
- Comments written in other languages are allowed.
- The substance of a post should be comprehensible for people who only speak English.
- Titles and post bodies written in other languages will be allowed, but only as long as the above rule is observed.
6. (NEW!) Regarding public figures
We all have our opinions, and certain public figures can be divisive. Keep in mind that this is a community for memes and light-hearted fun, not for airing grievances or leveling accusations. - Keep discussions polite and free of disparagement.
- We are never in possession of all of the facts. Defamatory comments will not be tolerated.
- Discussions that get too heated will be locked and offending comments removed. Β
Please report posts and comments that break these rules!
Important: never execute code or follow advice that you don't understand or can't verify, especially here. The word of the day is credibility. This is a meme community -- even the most helpful comments might just be shitposts that can damage your system. Be aware, be smart, don't remove France.
I always rename my branch to main. Because it's shorter? That's the extent of my reasoning. Thanks for coming to my ted talk.
Just use main
. I'm not bothered by either, but I'm not in the demographic that would be bothered by master
, so I use main
and STFU. It takes way less effort to switch to main
(if you haven't already) than to come up with all this rhetoric about why master
shouldn't trigger people.
I would argue that it's best/easiest to leave existing projects on master, and just use main for new ones. Either way I agree, people arw reactionary af about this issue
The default branch for some projects is "production" since CD deploys on pushing to that branch
For new projects, main. My thought is that even if master is not offensive, since the industry has generally made the change, the only reason to stick with master is stubbornness or hating political correctness, neither of which aligns with my self-view so I'll use main and move on.
In general if people are genuinely hurt by the use of some words, I'm not sadistic so I'll avoid using them. From my perspective morality is the pursuit of the reduction of suffering, even if that suffering is internal.
It kills me that this take is so hard to find online.
Did I think calling the main branch βmasterβ was offensive before this controversy? No, Iβd never even considered it.
Does switching to calling it βmainβ impact me, likeβ¦ at all? Also no. Itβs like the lowest effort change to make.
If I can make my industry more welcoming to a more diverse group of people, that is a solid victory and way more important than the name of my primary git branch.
I mean, the problem people have with it isn't a name change or improving inclusivity. It's the fact that they feel like they are being bullied into doing something they had no input into in the name of inclusivity. What pisses people off is how, as soon as someone says "x" isn't maximally inclusive of some marginalized group, everyone has to change or else get called a categorically bad person.
For example, suppose you have a red hat that you enjoy wearing. You got it at wafflefest a decade ago, and it says "I <3 Waffles". Then one day, your boss sends out an email that no more red hats are allowed in the office because it might create an unwelcoming environment. You will, of course, be pissed off. Not because you can't wear your waffle hat anymore, but because your boss feels entitled to control the minutiae of you life like this. You'll think to yourself "fuck that guy, and fuck whoever brought up banning red hats in some corporate board room 1000 miles away. This is bullshit!"
People like their autonomy, and don't like being controlled. Doesn't matter if it is in the name of increased corporate profits, or inclusivity, or saving the bees, or dying of lung cancer. They don't care about the name of their git branch - they care that they feel like they are being forced to change it.
Donβt forget laziness. I have some projects that have been around forever and I am not changing it across my infra because I am lazy. I will do it next yearβ¦
It's a retroactive bastardization of the word based on one particular culture's one particular interpretation of it (master being, apparently, a slaveowner) that ignores both the much earlier meanings of master artisan or master craftsman (as opposed to journeyman and apprentice) and masterpiece (through which an artisan is recognised as a master), and the modern meaning of a master copy (like a master record in disc printing).
This isn't like replacing the "master and slave" terminology with regard to connected devices. That one was warranted because it was often inaccurate and confusing. But forcing the adoption of main instead of master feels like someone got offended on someone else's behalf because a word looked superficially like that other bad word, and apparently we can't have an understanding that goes deeper than what letters it's made up of.
Amerika ist wunderbar. This is an --initial-branch=master
household.
regardless of that, it's never inconvenienced me and it's still a net gain in readability, since main
actually means what it means. have my shell scripts set up to use either one for any repo I'm in automatically.
Honestly it's not even about convenience. As far as breaking conventions go, this one has none-to-minimal impact -- existing master
branches won't suddenly become invalid. But it's yet another instance of a subset of a subset of a subset of users getting to enforce their sensibilities for superficial reasons, and ultimately with zero effect regarding the cause they claim to represent; cultural and linguistic differences be damned.
I'd love to be more specific, but I don't want the comments to turn into a warzone.
At some point needlessly banning words just empowers bigots by letting them claim larger and larger parts of the vocabulary. Shouldn't we try to reclaim words instead, and deprive the words of their power? Just "banning" words, especially in cases such as this one when the connection to master/slave is pretty weak, actually increases the negative power of the words and I'd argue empowers people with malicious intent
Master. I find the whole "reasoning" behind the controversy absolute horseshit peddled by nontechnical people on the sidelines
Just that master doesn't actually makes much sense in most git workflows.
If you understand master like you would understand the master/slave relationship in old tech, then of course, master seems to make sense until you realize that there is no slave in that sense or in name. Additional, master is rarely doing anything but having release or hot fixes being merged into it. Arguably dev is the master of the branches.
In other words, master was always a bad name. It is silly to rename it because "racism" but it is at least equally silly to act like master is a much better name than "main" or "live" or "prod" or ... Fuck, the list is long.
I personally don't think the word "master" should be considered offensive - my wife has a master's degree in deaf education - but I've switched to "main" because that seems to be the convention now and it really doesn't have to be an issue.
There's no "slave" convention in git so I'm not sure how it can be considered an issue (I get that drives being master and slave is a bit icky). But then, what is it a master of?
As others have said, "trunk" would have been a more sensible replacement.
It's a master the same way that an original recording (the final version before mass reproduction) is called a master; mixing and processing the raw media clips into such a recording is called mastering. It's a convention that has existed long before computers were a thing.
Main.
Don't get me wrong, the whole debate is Microsoft just being performative (why not use your vast wealth to actually help people?). But honestly, putting the debate aside, "main" is just a clearer and more intuitive name.
main
in the streets, master
in the sheets
I get wanting to move away from "master," but why in the world didn't we use "trunk"
It was already a standard name, and it fits "branches," etc.
"trunk" is what it was called in SVN, too. Well, kind of. SVN didn't have a real concept of branching like Git does, but the main development would almost always happen in a root directory called "trunk".
I'm not sure why Bitkeeper used "master", but that's why Git called it that (Git was originally built as a replacement for Bitkeeper).
Mommy.
git checkout mommy
about to start using mommy for all my projects now
MOAB (mother of all branches)
Master. I find this out of context fight against words pathetic.
My scrum master said that we need new tickets to update the git branches and pipelines to use main instead of master since master was a bad word.
I asked him what his job title was again and there was a pause.
Then he said we can't say that we are going to groom the code base anymore.
I don't care which one you use, just don't change it once it's established. So many legacy Yocto projects got broken cause open source libraries changed their branch names.
I donβt care which one you use, just donβt change it once itβs established. So many legacy Yocto projects got broken cause open source libraries changed their branch names.
This was one of the arguments when the renaming was first proposed. "Just rename it, it won't break anything! It's only racists that want to keep the name!"
Sure, except for all the CI/CD scripts, release scripts, etc that all have "master" there and are now broken.
I know of a company that their entire CI pipeline was broken overnight because some "helpful" person renamed the branch to master but didn't bother checking out their pipelines...
If it uses master
and it's too much trouble to get people to switch. It stays master
until we can coordinate.
If I'm starting a new project I use main
.
Why?
It doesn't take much to do and it avoids any misunderstandings or arguments and we've got work to do. I don't particular care if you guys are "stuck" on master
. If that's what it is and everyone wants to keep it that way, I don't have enough will to change it. If it's under my control, I will change it.
I can work with either, but I cannot and will not forgive any deliberate changes from main to master.
If you have a main and a master branch in the same repo and you don't delete one at the very start of the project, God has abandoned the living bcz we're lost and he has forsaken all that is good in the world.