690
Merge conflicts (feddit.nl)
submitted 1 year ago by to c/programmer_humor@programming.dev
59 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 4 points 1 year ago (14 children)

I'm glad I'm not part of "we"

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 14 child comments
    •
  • [–] 12 points 1 year ago (13 children)

    Why do you care

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 13 child comments
    •
  • [–] 7 points 1 year ago (12 children)

    Because this whole discussion is fucking stupid. There was no good reason for a change.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 12 child comments
    •
  • [–] 4 points 1 year ago (5 children)

    You doth protest too much. Wonder why

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 5 child comments
    •
  • [–] 11 points 1 year ago (4 children)

    Because the argument is stupid. Much like pointers not being a good term to use because it’s rude to point. Or man pages being sexist.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 4 child comments
    •
  • [–] 5 points 1 year ago*

    I've never heard that pointer bullshit at all. Can you link it?

    "Man" for "manual" is just an antiquated term kept around by Unix curmudgeons. "Help" is much better as it requires no explanation and conveniently is automatically abbreviated to its full name. It's the common term used in most other systems that aren't linux.

    'Man" isn't sexist, it just sucks.

  • permalink
  • fedilink
  • source
  • parent
  • [–] -5 points 1 year ago (2 children)

    What's stupid is that people like you argue about a branch name instead of just cede the point as if it costs anyone anything to

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 2 points 1 year ago (1 child)

    Actually this cost a lot of time and money. Even today I have to take an extra step to see if master or main is use . Before it was standard.

    Curse this

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •
  • [–] -1 points 1 year ago

    If this was hard for your company to change, you did things wrong. I work with git everyday and I've no idea what extra step you mean. Git software of all stripes will show you front and center what branches exist and what's default. People pissed about this just wanna whine and they can downvote me a million times if they want

  • permalink
  • fedilink
  • source
  • parent
  • [–] -3 points 1 year ago (2 children)

    The good reason was that it bothered some people. "Main" is two fewer letters, so it's even more convenient to type. So what's the problem?

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 13 points 1 year ago (1 child)

    European here. I'm a supporter of civil rights and against racism and so on, but that controversy with master vs main for me is just a silly us american controversy, as master has more meanings that just owner of a slave (and in this context, it's not even related to that master-slave thing as used to be in hardware naming).

    The issue is that kind of (in my pov, unnecessary) change caused an outage in my company as some k8s objects changed its label because of this kind of controversy, and some of our selectors were not ready for that change, as iirc this happened in a minor version upgrade. We also had to invest development hours to update internal tooling to support that change too (and I bet, a lot of companies did the same).

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •