BROWNTOWN
  • Communities
  • Create Post
  • Create Community
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
Sibshops@lemmy.myserv.one to Programmer Humor@programming.dev · 1 year ago

Master vs main (again)

lemmy.myserv.one

message-square
40
link
fedilink
249

Master vs main (again)

lemmy.myserv.one

Sibshops@lemmy.myserv.one to Programmer Humor@programming.dev · 1 year ago
message-square
40
link
fedilink
alert-triangle
You must log in or # to comment.
  • Lena@gregtech.eu
    link
    fedilink
    English
    arrow-up
    75
    ·
    1 year ago

    • pelya@lemmy.world
      link
      fedilink
      arrow-up
      23
      ·
      1 year ago

      • BartyDeCanter@lemmy.sdf.org
        link
        fedilink
        arrow-up
        6
        ·
        1 year ago

        What are you doing step-branch?

    • Eager Eagle@lemmy.world
      link
      fedilink
      English
      arrow-up
      23
      arrow-down
      1
      ·
      1 year ago

      I prefer master exactly for that reason

      • Dejected Warp Core@lemmy.world
        link
        fedilink
        arrow-up
        1
        ·
        1 year ago

        ::sigh:: This is the correct answer for a buttplug.io based workflow.

  • CodenameDarlen@lemmy.worlddeleted by creator
    link
    fedilink
    arrow-up
    46
    ·
    edit-2
    5 months ago

    deleted by creator

    • Eager Eagle@lemmy.world
      link
      fedilink
      English
      arrow-up
      22
      ·
      1 year ago

      doesn’t matter: ma TAB

      • oplkill@lemmy.worlddeleted by creator
        link
        fedilink
        arrow-up
        7
        ·
        1 year ago

        Some newbie at project: git checkout -b main_problem_task123

    • Sibshops@lemmy.myserv.oneOP
      link
      fedilink
      arrow-up
      18
      ·
      1 year ago

      The best reason is always in the comments

  • Hoimo@ani.social
    link
    fedilink
    arrow-up
    32
    ·
    1 year ago

    I use master and apprentice. Always two there are, no more, no less.

    • rockerface🇺🇦@lemmy.cafe
      link
      fedilink
      English
      arrow-up
      8
      ·
      1 year ago

      So that’s why Sith were considered evil

    • Morose@lemmy.world
      link
      fedilink
      English
      arrow-up
      7
      ·
      1 year ago

      Only a sith deals in absolutes, I will do what I must.

    • Captain_Faraday@programming.dev
      link
      fedilink
      English
      arrow-up
      5
      ·
      1 year ago

      I think will actually start using this “master” and “apprentice” now. Love it lol

    • NigelFrobisher@aussie.zone
      link
      fedilink
      arrow-up
      1
      ·
      1 year ago

      Why isn’t there a journeyman Sith though?

  • raman_klogius@ani.social
    link
    fedilink
    English
    arrow-up
    31
    ·
    1 year ago

    Treat branches like Chinese dynasties. The mainline branch is the one having the mandate of heaven.

    • rockerface🇺🇦@lemmy.cafe
      link
      fedilink
      English
      arrow-up
      12
      ·
      1 year ago

      And they tend to fracture and rejoin seemingly at random, but with certain regularity

  • TheFunkyMonk@lemmy.world
    link
    fedilink
    arrow-up
    24
    ·
    1 year ago

    I’m fairly confident the random branches I spin off to try out a dumb idea are not equal to main.

    • Skibbidi@programming.dev
      link
      fedilink
      English
      arrow-up
      14
      ·
      1 year ago

      I know mine are worth less than others.

  • xxce2AAb@feddit.dk
    link
    fedilink
    arrow-up
    28
    arrow-down
    5
    ·
    1 year ago

    I’m… I’m not sure that’s the flex you think it is.

    • Darkcoffee@sh.itjust.works
      link
      fedilink
      arrow-up
      45
      ·
      1 year ago

      I think it’s mostly a shitpost lol

      • xxce2AAb@feddit.dk
        link
        fedilink
        arrow-up
        2
        arrow-down
        3
        ·
        1 year ago

        You’re not wrong.

      • digital_man@lemmy.world
        link
        fedilink
        arrow-up
        2
        arrow-down
        8
        ·
        1 year ago

        White shitpost?

        • Sibshops@lemmy.myserv.oneOP
          link
          fedilink
          arrow-up
          9
          ·
          1 year ago

          It just bothers me that “master” branch is a misnomer. It’s a hold over from CVS/SVN where there was actually a central authoritative branch. I’m not necessary saying the other reasons don’t have merit, as well.

          • LedgeDrop@lemmy.zip
            link
            fedilink
            arrow-up
            2
            ·
            1 year ago

            trunk?

            • DreamButt@lemmy.world
              link
              fedilink
              English
              arrow-up
              3
              ·
              1 year ago

              I always rename it to “dev.” Hard to have any problems or confusion with that

              • onlinepersona@programming.dev
                link
                fedilink
                arrow-up
                2
                arrow-down
                1
                ·
                1 year ago

                dev is confusing it implies it’s not the stable branch, no? Or was the master branch never stable for you?

                • DreamButt@lemmy.world
                  link
                  fedilink
                  English
                  arrow-up
                  0
                  ·
                  1 year ago

                  The only time I merge unstable code is behind a feature flag

            • Evil_Shrubbery@thelemmy.club
              link
              fedilink
              arrow-up
              2
              ·
              1 year ago

              Master’s trunk ( ͡° ͜ʖ ͡°)

  • Sibbo@sopuli.xyz
    link
    fedilink
    arrow-up
    16
    arrow-down
    1
    ·
    1 year ago

    Imagine the mess in a thousand people project where all branches are “equal”

    • Eager Eagle@lemmy.world
      link
      fedilink
      English
      arrow-up
      10
      ·
      1 year ago

      I work on a few repos that have branches that are rarely merged to the default one and it’s quite annoying

  • GreenKnight23@lemmy.world
    link
    fedilink
    arrow-up
    14
    ·
    1 year ago

    I do whatever work wants me to do. you want “main” or “icecream” as the production branch, whatever.

    I’ll keep using master for all my personal repos because it’s a master record of the source from which all other branches are derived. it’s like the difference between “read” and “read”. spelled the same but completely different definitions.

  • hotdogcharmer@lemmy.zip
    link
    fedilink
    arrow-up
    9
    ·
    1 year ago

    I think ‘master’ is fine for the master branch. It’s a master copy of the codebase.

    I think ‘main’ is fine for the main branch. It’s the main branch of the repo.

    I use ‘main’ at work cos that’s what my git client defaults to. I use ‘master’ at home because that’s what my git client defaults to. 🤷‍♂️

  • fruitcantfly@programming.dev
    link
    fedilink
    arrow-up
    8
    ·
    1 year ago

    I’ve started converting my ‘master’ branches to ‘main’, due to the fact that my muscle-memory has decided that ‘main’ is the standard name. And I don’t have strong feelings either was

  • sp3ctr4l@lemmy.dbzer0.com
    link
    fedilink
    English
    arrow-up
    6
    ·
    1 year ago

    … Has anyone adopted a ‘Master’ - ‘Padawan’ paradigm?

  • gigachad@piefed.social
    link
    fedilink
    English
    arrow-up
    5
    ·
    1 year ago

    git config --global init.defaultBranch main

  • Little8Lost@lemmy.world
    link
    fedilink
    English
    arrow-up
    4
    ·
    1 year ago

    The next release branch is the one i am currently working on. No need to merge it back to the other one

  • katy ✨@piefed.blahaj.zone
    link
    fedilink
    English
    arrow-up
    2
    ·
    1 year ago

    i just call my main git branches trunk

  • SecondSet@programming.dev
    link
    fedilink
    English
    arrow-up
    2
    ·
    edit-2
    1 year ago

    Real talk, “master” refers to a “master copy” from which new branches are can be made from. If one of these branches becomes “better” than the current master copy, it gets “merged” into the master copy effectively replacing it as the new master copy (sometimes totally, sometimes partially).

    Edit: Pretty sure basically everyone here knows this, but I figured it could not hurt to put the explanation here.

Programmer Humor@programming.dev

programmer_humor@programming.dev

Subscribe from Remote Instance

Create a post
You are not logged in. However you can subscribe from another Fediverse account, for example Lemmy or Mastodon. To do this, paste the following into the search field of your instance: [email protected]

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

  • Keep content in english
  • No advertisements
  • Posts must be related to programming or programmer topics
    • If the mod doesn’t find it funny, you’re banned. Ha-ha!.. For real: do not use the community for “statements”. There are other places for such content. Keep it chill and funny.
Visibility: Public
globe

This community can be federated to other instances and be posted/commented in by their users.

  • 1.96K users / day
  • 5.44K users / week
  • 8.51K users / month
  • 16.2K users / 6 months
  • 2 local subscribers
  • 33.8K subscribers
  • 1.75K Posts
  • 38.8K Comments
  • Modlog
  • mods:
  • adr1an@programming.dev
  • Feyter@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.19
  • Modlog
  • Instances
  • Docs
  • Code
  • join-lemmy.org