okr765
  • Communities
  • Create Post
  • Create Community
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
Sibshops@lemmy.myserv.one to Programmer Humor@programming.dev · 2 个月前

Master vs main (again)

lemmy.myserv.one

message-square
44
fedilink
307

Master vs main (again)

lemmy.myserv.one

Sibshops@lemmy.myserv.one to Programmer Humor@programming.dev · 2 个月前
message-square
44
fedilink
alert-triangle
You must log in or register to comment.
  • CodenameDarlen@lemmy.world
    link
    fedilink
    arrow-up
    46
    ·
    2 个月前

    I dislike master because main is shorter and faster to type

    • Eager Eagle@lemmy.world
      link
      fedilink
      English
      arrow-up
      23
      ·
      edit-2
      2 个月前

      doesn’t matter: ma TAB

      • oplkill@lemmy.world
        link
        fedilink
        arrow-up
        8
        ·
        2 个月前

        Some newbie at project: git checkout -b main_problem_task123

    • Sibshops@lemmy.myserv.oneOP
      link
      fedilink
      arrow-up
      18
      ·
      2 个月前

      The best reason is always in the comments

  • Hoimo@ani.social
    link
    fedilink
    arrow-up
    40
    ·
    2 个月前

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

    • rockerface🇺🇦@lemmy.cafe
      link
      fedilink
      English
      arrow-up
      11
      ·
      2 个月前

      So that’s why Sith were considered evil

    • Morose@lemmy.world
      link
      fedilink
      English
      arrow-up
      9
      ·
      2 个月前

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

    • Captain_Faraday@programming.dev
      link
      fedilink
      English
      arrow-up
      5
      ·
      2 个月前

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

    • NigelFrobisher@aussie.zone
      link
      fedilink
      arrow-up
      2
      ·
      2 个月前

      Why isn’t there a journeyman Sith though?

  • raman_klogius@ani.social
    link
    fedilink
    English
    arrow-up
    36
    ·
    2 个月前

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

    • rockerface🇺🇦@lemmy.cafe
      link
      fedilink
      English
      arrow-up
      11
      ·
      2 个月前

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

  • xxce2AAb@feddit.dk
    link
    fedilink
    arrow-up
    31
    arrow-down
    5
    ·
    2 个月前

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

    • Darkcoffee@sh.itjust.works
      link
      fedilink
      arrow-up
      50
      ·
      2 个月前

      I think it’s mostly a shitpost lol

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

        You’re not wrong.

      • digital_man@lemmy.world
        link
        fedilink
        arrow-up
        2
        arrow-down
        9
        ·
        2 个月前

        White shitpost?

        • Sibshops@lemmy.myserv.oneOP
          link
          fedilink
          arrow-up
          10
          arrow-down
          2
          ·
          2 个月前

          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
            ·
            2 个月前

            trunk?

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

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

              • onlinepersona@programming.dev
                link
                fedilink
                arrow-up
                2
                ·
                2 个月前

                Yaaaaaaaaa!

            • DreamButt@lemmy.world
              link
              fedilink
              English
              arrow-up
              3
              ·
              2 个月前

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

              • onlinepersona@programming.dev
                link
                fedilink
                arrow-up
                3
                arrow-down
                1
                ·
                2 个月前

                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
                  ·
                  2 个月前

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

  • TheFunkyMonk@lemmy.world
    link
    fedilink
    arrow-up
    26
    ·
    2 个月前

    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
      ·
      2 个月前

      I know mine are worth less than others.

  • Sibbo@sopuli.xyz
    link
    fedilink
    arrow-up
    17
    arrow-down
    1
    ·
    2 个月前

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

    • Eager Eagle@lemmy.world
      link
      fedilink
      English
      arrow-up
      10
      ·
      2 个月前

      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
    16
    ·
    2 个月前

    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
    2 个月前

    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
    10
    ·
    2 个月前

    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
      ·
      2 个月前

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

  • onlinepersona@programming.dev
    link
    fedilink
    arrow-up
    8
    ·
    2 个月前

    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.

  • sp3ctr4l@lemmy.dbzer0.com
    link
    fedilink
    English
    arrow-up
    7
    ·
    2 个月前

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

  • Ricky Rigatoni@retrolemmy.com
    link
    fedilink
    arrow-up
    7
    arrow-down
    1
    ·
    2 个月前

    Why not call it trunk and make it all tree themed

    • Sibshops@lemmy.myserv.oneOP
      link
      fedilink
      arrow-up
      4
      arrow-down
      1
      ·
      2 个月前

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

      • Ricky Rigatoni@retrolemmy.com
        link
        fedilink
        arrow-up
        10
        ·
        2 个月前

        What is a trunk if not a large branch

        • Sibshops@lemmy.myserv.oneOP
          link
          fedilink
          arrow-up
          5
          ·
          edit-2
          2 个月前

          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
          ·
          2 个月前

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

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

      • BatmanAoD@programming.dev
        link
        fedilink
        arrow-up
        4
        ·
        2 个月前

        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
      ·
      2 个月前

      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.

  • gigachad@piefed.social
    link
    fedilink
    English
    arrow-up
    5
    ·
    2 个月前

    git config --global init.defaultBranch main

  • Little8Lost@lemmy.world
    link
    fedilink
    English
    arrow-up
    4
    ·
    2 个月前

    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
    3
    ·
    2 个月前

    i just call my main git branches trunk

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.

  • 1.56K users / day
  • 3.24K users / week
  • 9K users / month
  • 18.2K users / 6 months
  • 1 local subscriber
  • 27.8K subscribers
  • 1.75K Posts
  • 57.9K Comments
  • Modlog
  • mods:
  • Feyter@programming.dev
  • adr1an@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.9
  • Modlog
  • Instances
  • Docs
  • Code
  • join-lemmy.org