lemmy.dudeami.win
  • Communities
  • Create Post
  • Create Community
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
Sibshops@lemmy.myserv.one to Programmer Humor@programming.dev · 4 天前

Master vs main (again)

lemmy.myserv.one

message-square
48
fedilink
299

Master vs main (again)

lemmy.myserv.one

Sibshops@lemmy.myserv.one to Programmer Humor@programming.dev · 4 天前
message-square
48
fedilink
alert-triangle
You must log in or register to comment.
  • Lena@gregtech.eu
    link
    fedilink
    English
    arrow-up
    84
    ·
    4 天前

    • Eager Eagle@lemmy.world
      link
      fedilink
      English
      arrow-up
      30
      ·
      4 天前

      I prefer master exactly for that reason

      • dejected_warp_core@lemmy.world
        link
        fedilink
        arrow-up
        4
        ·
        3 天前

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

    • pelya@lemmy.world
      link
      fedilink
      arrow-up
      26
      ·
      4 天前

      • BartyDeCanter@lemmy.sdf.org
        link
        fedilink
        arrow-up
        7
        ·
        4 天前

        What are you doing step-branch?

  • Hoimo@ani.social
    link
    fedilink
    arrow-up
    40
    ·
    4 天前

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

    • NigelFrobisher@aussie.zone
      link
      fedilink
      arrow-up
      2
      ·
      3 天前

      Why isn’t there a journeyman Sith though?

    • rockerface🇺🇦@lemmy.cafe
      link
      fedilink
      English
      arrow-up
      11
      ·
      4 天前

      So that’s why Sith were considered evil

    • Morose@lemmy.world
      link
      fedilink
      English
      arrow-up
      9
      ·
      4 天前

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

    • Captain_Faraday@programming.dev
      link
      fedilink
      English
      arrow-up
      5
      ·
      4 天前

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

  • CodenameDarlen@lemmy.world
    link
    fedilink
    arrow-up
    46
    ·
    4 天前

    I dislike master because main is shorter and faster to type

    • Eager Eagle@lemmy.world
      link
      fedilink
      English
      arrow-up
      22
      ·
      edit-2
      4 天前

      doesn’t matter: ma TAB

      • oplkill@lemmy.world
        link
        fedilink
        arrow-up
        8
        ·
        4 天前

        Some newbie at project: git checkout -b main_problem_task123

    • Sibshops@lemmy.myserv.oneOP
      link
      fedilink
      arrow-up
      18
      ·
      4 天前

      The best reason is always in the comments

  • raman_klogius@ani.social
    link
    fedilink
    English
    arrow-up
    36
    ·
    4 天前

    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
      ·
      4 天前

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

  • onlinepersona@programming.dev
    link
    fedilink
    arrow-up
    8
    ·
    3 天前

    Someone suggested queen and worker. Luffy and then branches named after crew members also seemed nice. Another suggested dom and sub. Leader and cultist were other suggestions. For any StarCraft mod it should be Kerrigan and Raynor, or OverMind and Zerg, or for the later stages Amon and Protoss.

    I love all those suggestions. Keeps things interesting and conveys the same thing.

  • TheFunkyMonk@lemmy.world
    link
    fedilink
    arrow-up
    26
    ·
    4 天前

    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
      ·
      4 天前

      I know mine are worth less than others.

  • Ricky Rigatoni@retrolemmy.com
    link
    fedilink
    arrow-up
    7
    arrow-down
    1
    ·
    3 天前

    Why not call it trunk and make it all tree themed

    • Sibshops@lemmy.myserv.oneOP
      link
      fedilink
      arrow-up
      4
      arrow-down
      1
      ·
      3 天前

      Cause git doesn’t work that way. There is no trunk. It’s all branches.

      • Ricky Rigatoni@retrolemmy.com
        link
        fedilink
        arrow-up
        11
        ·
        3 天前

        What is a trunk if not a large branch

        • Sibshops@lemmy.myserv.oneOP
          link
          fedilink
          arrow-up
          6
          ·
          edit-2
          3 天前

          Oh, that’s valid, and forks could be called “asexual propagation”

          Cherry picking from one trunk to another could be called grafting.

          There is already pruning.

          If there is no AI used, it could be called GMO.

          I’m not sure if there is a tree analogy for merging trunks together, however.

        • DragonTypeWyvern@midwest.social
          link
          fedilink
          arrow-up
          1
          ·
          3 天前

          https://en.m.wikipedia.org/wiki/Branch

          https://en.m.wikipedia.org/wiki/Trunk_(botany)

      • BatmanAoD@programming.dev
        link
        fedilink
        arrow-up
        4
        ·
        3 天前

        But that’s not actually true in general; there is a default branch concept in forges, and an integration and/or release branch in most recommended workflows. That’s the trunk.

    • dejected_warp_core@lemmy.world
      link
      fedilink
      arrow-up
      1
      ·
      3 天前

      To be completely fair, I’ve worked in places that treat Git like it’s an over-engineered SVN and use the SVN workflow, fighting against the current the entire way. “trunk” would be just fine with that crowd.

  • xxce2AAb@feddit.dk
    link
    fedilink
    arrow-up
    31
    arrow-down
    5
    ·
    4 天前

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

    • Darkcoffee@sh.itjust.works
      link
      fedilink
      arrow-up
      50
      ·
      4 天前

      I think it’s mostly a shitpost lol

      • digital_man@lemmy.world
        link
        fedilink
        arrow-up
        1
        arrow-down
        8
        ·
        4 天前

        White shitpost?

        • Sibshops@lemmy.myserv.oneOP
          link
          fedilink
          arrow-up
          11
          arrow-down
          2
          ·
          4 天前

          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
            ·
            4 天前

            trunk?

            • Evil_Shrubbery@thelemmy.club
              link
              fedilink
              arrow-up
              5
              ·
              edit-2
              4 天前

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

              • onlinepersona@programming.dev
                link
                fedilink
                arrow-up
                2
                ·
                3 天前

                Yaaaaaaaaa!

            • DreamButt@lemmy.world
              link
              fedilink
              English
              arrow-up
              2
              ·
              4 天前

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

              • onlinepersona@programming.dev
                link
                fedilink
                arrow-up
                3
                ·
                3 天前

                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
                  1
                  ·
                  3 天前

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

      • xxce2AAb@feddit.dk
        link
        fedilink
        arrow-up
        2
        arrow-down
        3
        ·
        4 天前

        You’re not wrong.

  • GreenKnight23@lemmy.world
    link
    fedilink
    arrow-up
    16
    ·
    4 天前

    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
    12
    ·
    edit-2
    4 天前

    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. 🤷‍♂️

  • Sibbo@sopuli.xyz
    link
    fedilink
    arrow-up
    17
    arrow-down
    1
    ·
    4 天前

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

    • Eager Eagle@lemmy.world
      link
      fedilink
      English
      arrow-up
      10
      ·
      4 天前

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

  • fruitcantfly@programming.dev
    link
    fedilink
    arrow-up
    10
    ·
    4 天前

    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

    • Gonzako@lemmy.world
      link
      fedilink
      arrow-up
      1
      ·
      3 天前

      Main do be a bit less left hand heavy. Which depending on the user may find as a disadvantage.

  • sp3ctr4l@lemmy.dbzer0.com
    link
    fedilink
    English
    arrow-up
    7
    ·
    4 天前

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

  • gigachad@piefed.social
    link
    fedilink
    English
    arrow-up
    5
    ·
    4 天前

    git config --global init.defaultBranch main

  • Little8Lost@lemmy.world
    link
    fedilink
    English
    arrow-up
    4
    ·
    4 天前

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

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: !programmer_humor@programming.dev

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
Visibility: Public
globe

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

  • 2.51K users / day
  • 5.08K users / week
  • 8.99K users / month
  • 19.6K users / 6 months
  • 1 local subscriber
  • 26.8K subscribers
  • 1.67K Posts
  • 55.8K Comments
  • Modlog
  • mods:
  • Feyter@programming.dev
  • adr1an@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.8
  • Modlog
  • Instances
  • Docs
  • Code
  • join-lemmy.org