this post was submitted on 20 Aug 2024
625 points (88.7% liked)

Showerthoughts

38763 readers
701 users here now

A "Showerthought" is a simple term used to describe the thoughts that pop into your head while you're doing everyday things like taking a shower, driving, or just daydreaming. The most popular seem to be lighthearted clever little truths, hidden in daily life.

Here are some examples to inspire your own showerthoughts:

Rules

  1. All posts must be showerthoughts
  2. The entire showerthought must be in the title
  3. No politics
    • If your topic is in a grey area, please phrase it to emphasize the fascinating aspects, not the dramatic aspects. You can do this by avoiding overly politicized terms such as "capitalism" and "communism". If you must make comparisons, you can say something is different without saying something is better/worse.
    • A good place for politics is c/politicaldiscussion
  4. Posts must be original/unique
  5. Adhere to Lemmy's Code of Conduct and the TOS

If you made it this far, showerthoughts is accepting new mods. This community is generally tame so its not a lot of work, but having a few more mods would help reports get addressed a little sooner.

Whats it like to be a mod? Reports just show up as messages in your Lemmy inbox, and if a different mod has already addressed the report, the message goes away and you never worry about it.

founded 2 years ago
MODERATORS
 

It sounds way less offensive to those who decry the original terminology's problematic roots but still keeps its meaning intact.

you are viewing a single comment's thread
view the rest of the comments
[–] SpaceCadet@feddit.nl 21 points 1 year ago* (last edited 1 year ago) (16 children)

master over main

That one is the most stupid one too, because master in git doesn't even refer to a master/slave relationship. It refers to a different meaning of the word master, namely "an original from which copies can be made", as in master recording or master key. See 5b in the Merriam-Webster dictionary. And that's how it's used in git: any new branches are derived from master. Main just does not have the same nuance, because it does not imply a relationship between the branches, just that it's somehow more important than the others.

But of course, the real reason it was changed is because for companies like github it's easier to give in to the crazies who demand this than to fight them.

[–] aodhsishaj@lemmy.world 3 points 1 year ago* (last edited 1 year ago) (15 children)

Is it not the main working branch? Git is a system of change not just recording change. When you start a new project, do you open a new branch or create a whole new repository? That's not rhetorical I'm genuinely curious.

[–] SpaceCadet@feddit.nl 13 points 1 year ago (12 children)

Is it not the main working branch

No it is not. On large distributed projects for which git was designed, you typically don't directly work on main/master but you create a working branch to do your changes, and when they are ready you merge them to main/master.

There are many types of git workflows, but main/master usually contains the code that is deployed to production or the latest stable release and not some work in progress.

When you start a new project, do you open a new branch or create a whole new repository?

You have to define "project" for that.

  • Is your project a change to existing code -> new branch, merge to main/master when done
  • Is your project something new that stands entirely on its own? -> new repository
[–] PlexSheep 2 points 1 year ago

In fact, many projects forbid pushing to master entirely and only allow reviewed merging to the master. Then, every time the master changes, a new release of the software is made (either manually or automatically with CI/CD)

load more comments (11 replies)
load more comments (13 replies)
load more comments (13 replies)