live / staging / dev
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 honestly donβt know, and Iβm not at my PC to check. I assume itβs main, but with my ADHD Iβve never actually paid attention to that. All I ever remember are my branch names.
mainline
Zeus
Eh, I mix and match them..
My repos use main because i guess that was the default, but i don't really care. I mean i also call my window manager layout master/stack and i don't see what's wrong with that.
Develop
For all the sudden word scholars here: there is no second word "master" that's spelled, pronounced, and written exactly the same as the other one but is entirely unrelated to the concept of master\slave. All modern meanings of the word master derive from the same root: magister, meaning an authority or teacher.
A "master recording" is the authority, the base copy from which all others are duplicated. They aren't called "slave" copies, although the primary use of the terms in computing did originally use those 2 words. Also as someone else pointed out, you don't even really make copies of git branches in the same way as audio so the term is misapplied.
Main is also a bad name, unless you're working on a solo project with only 1 main branch and some features. As soon as you start collaborating with other people, you should really have individual dev branches or "forks" (be honest, 90% of you aren't rawdogging git straight from the CLI, there's a forge website involved as hub) to work on, with an integration\testing "fork"\branch to combine work and a release branch for final code, with each discrete release tagged.
No gods, no kings, no masters!
Is use develop
anyways. because main
/ master
is for deployments only. When it comes to starting a new project, I don't give a flying horseshit of a fuck. I use whatever git sets me up with and due to terminal auto complete it's ma
TAB either way. The way I experienced it, everyone with a strong preference towards either is an annoying shithat of a person who will be booted from my team the moment they start this debate.
main-master, with all branches being non-main masters. No slaves in my neighborhood.