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 thread.
View all comments View context
3 points
*

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.

permalink
report
parent
reply
2 points

you don’t work on main/master, you make a branch to work in, and then merge your changes back into master/main

permalink
report
parent
reply
4 points
*

Respectfully, I can do whatever the fuck I want. That’s the point of git. If I want to branch my way down to a stack overflow due to running out of free memory my system will very happily let me do that.

permalink
report
parent
reply
13 points

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
permalink
report
parent
reply
0 points

Ah we develop the same way. There’s testing then staging then prod is final review and is then finally merged to Main after documentation. Main branch is protected and merges are gated by review. There’s no need for master terminology there.

permalink
report
parent
reply
1 point

Wait huge? Shouldn’t Prod be the last place any changes go ?

permalink
report
parent
reply
4 points

There’s no need for master terminology there

Nobody said there is a need, you could call it foo or bar and it would still work. It just that master more accurately describes what it is. Main for example does not describe a derivative relationship, master does.

Also, master in this context is totally unrelated to slavery so I could also just as easily say that there was no need to replace the existing terminology either. It doesn’t solve any real world problems of historic or currently existing slavery, and it doesn’t make anyone’s life better. The only reasons why it was done were appeasement and virtue signalling.

permalink
report
parent
reply
2 points

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)

permalink
report
parent
reply

Showerthoughts

!showerthoughts@lemmy.world

Create post

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. A showerthought should offer a unique perspective on an ordinary part of life.

Rules

  1. All posts must be showerthoughts
  2. The entire showerthought must be in the title
  3. Avoid politics
    • 3.1) NEW RULE as of 5 Nov 2024, trying it out
    • 3.2) Political posts often end up being circle jerks (not offering unique perspective) or enflaming (too much work for mods).
    • 3.3) Try c/politicaldiscussion, volunteer as a mod here, or start your own community.
  4. Posts must be original/unique
  5. Adhere to Lemmy’s Code of Conduct

Community stats

  • 5.9K

    Monthly active users

  • 1.2K

    Posts

  • 18K

    Comments