all 7 comments

sorted by: hot top controversial new old
[–] 13 points 11 months ago

i was told to change the name of master recently because it carries with it the negative connotation of slavery. ie master/slave

master hasn't been updated in almost 15 years and there's no way in hell i'm going to touch that. lol

  • source
  • [–] 4 points 11 months ago (3 children)

    ... Isn't master the current production code? How do you get a master that haven't been touched in 15 years?

  • source
  • hideshow 3 child comments
  • [–] 7 points 11 months ago (1 child)

    Because you have a terrible branching strategy

  • source
  • parent
  • hideshow 1 child comment
  • [–] 3 points 11 months ago

    73 feature branches in active development (most for several months), and one intern (currently on m/paternity leave) responsible for merging them. Check! In the meantime, several branches deployed to prod behind a reverse proxy with feature flags.

  • source
  • parent
  • [–] 3 points 11 months ago

    Checkout followed by 400 build errors because your entire toolchain and build pipeline has changed since you last touched it.

  • source
  • [–] 2 points 11 months ago

    When branches don't check out... that's a problem.

  • source
  • 23 comments in c/programmer_humor@programming.dev view that post
    [–] 42 points 11 months ago (2 children)

    it has always bothered me that checkout is overloaded: it can switch branches or discard pending changes in an unrecoverable way.

    so, PSA, you can replicate the safe part of checkout with git switch and the unsafe with git restore.

  • source
  • hideshow 2 child comments
  • [–] 30 points 11 months ago

    git push master --force

  • source
  • [–] 15 points 11 months ago

    I still see master branches everywhere, even my new personal repos. This git renaming story is one of the most stupid OSS pushes I remember. That and Gimp fork, that then died out I think.

  • source
  • [–] 10 points 11 months ago

    TranscriptionThe "It's an Older Meme, But It Checks Out" meme, featuring an image of an Imperial officer from Star Wars, with the caption:

    It's an older branch, sir

    But it checks out

  • source
  • [+] 12 points 11 months ago (8 children)
  • [–] 7 points 11 months ago (7 children)

    It wasn't even tech bros. Some people started using opensource software, discovered the master branch and lost their shit. Nobody meaningful had ever connected the name to anything malevolent, but those people made themselves be offended in the name of people who weren't even offended by it.

    Microsoft bought github and didn't want the bad press so they renamed it after the twitter shitstorm. The professional victims then moved on to whatever else made noise on twitter and that was that.

    I force all new projects to use master as all my old scripts and repos use master. Twitter shitstorms scan stay where they should be: in the toilet bowl of the internet aka twitter.

  • source
  • parent
  • hideshow 7 child comments
  • [–] 8 points 11 months ago (2 children)

    And think of all those poor processes being executed and killed.

  • source
  • parent
  • hideshow 2 child comments
  • [–] 3 points 11 months ago* (2 children)

    Meanwhile GitHub was (and is) doing contract work for ICE

  • source
  • parent
  • hideshow 2 child comments
  • load more comments (1 reply)
  • [–] 7 points 11 months ago (4 children)

    I usually create new repos through GitHub or another central repo's system, where it defaults to calling the main branch main. But I did recently create a new repo with my local Git's git init, and had to deal with a master branch on a completely new repo for the first time in a while. It was actually kinda a weird experience.

  • source
  • hideshow 4 child comments
  • [–] 8 points 11 months ago (1 child)

    If you haven’t already found it, you need to change your global git config (~/.gitconfig):

    git config --global init.defaultBranch main

    (or whatever you want to call it; e.g. daddy would work too)

    For any existing repositories you want to run the following command in the existing repository root (./.git/config):

    git config set init.defaultBranch main

  • source
  • parent
  • hideshow 1 child comment
  • [–] 2 points 11 months ago

    Yeah, current company has their internal git server default to master and it was a little odd first time I created a new repo. Luckily all the CI templates can recognize either name so I just switched it.

  • source
  • parent
  • [–] 2 points 11 months ago

    No latest branch

  • source
  • [–] 1 point 11 months ago

    I never understood why we moved away from "trunk".

  • source