GunCAD Index Forums
  • Communities
  • Create Post
  • Create Community
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
Sibshops@lemmy.myserv.one to Programmer Humor@programming.dev · 3 days ago

Master vs main (again)

lemmy.myserv.one

message-square
23
link
fedilink
217

Master vs main (again)

lemmy.myserv.one

Sibshops@lemmy.myserv.one to Programmer Humor@programming.dev · 3 days ago
message-square
23
link
fedilink
alert-triangle
You must log in or # to comment.
  • Ricky Rigatoni@retrolemmy.com
    link
    fedilink
    arrow-up
    6
    ·
    2 days ago

    Why not call it trunk and make it all tree themed

    • Sibshops@lemmy.myserv.oneOP
      link
      fedilink
      arrow-up
      4
      arrow-down
      1
      ·
      2 days ago

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

      • BatmanAoD@programming.dev
        link
        fedilink
        arrow-up
        3
        ·
        1 day ago

        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.

      • Ricky Rigatoni@retrolemmy.com
        link
        fedilink
        arrow-up
        10
        ·
        2 days ago

        What is a trunk if not a large branch

        • Sibshops@lemmy.myserv.oneOP
          link
          fedilink
          arrow-up
          6
          ·
          2 days ago

          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
          ·
          1 day ago

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

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

  • Lena@gregtech.eu
    link
    fedilink
    English
    arrow-up
    68
    ·
    3 days ago

  • onlinepersona@programming.dev
    link
    fedilink
    arrow-up
    5
    ·
    2 days ago

    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.

  • Hoimo@ani.social
    link
    fedilink
    arrow-up
    27
    ·
    3 days ago

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

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

      Why isn’t there a journeyman Sith though?

    • rockerface🇺🇦@lemmy.cafe
      link
      fedilink
      English
      arrow-up
      7
      ·
      3 days ago

      So that’s why Sith were considered evil

    • Captain_Faraday@programming.dev
      link
      fedilink
      English
      arrow-up
      3
      ·
      3 days ago

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

  • raman_klogius@ani.social
    link
    fedilink
    English
    arrow-up
    27
    ·
    3 days 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
      10
      ·
      3 days ago

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

  • xxce2AAb@feddit.dk
    link
    fedilink
    arrow-up
    22
    arrow-down
    4
    ·
    3 days ago

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

    • Darkcoffee@sh.itjust.works
      link
      fedilink
      arrow-up
      40
      ·
      3 days ago

      I think it’s mostly a shitpost lol

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

        You’re not wrong.

  • fruitcantfly@programming.dev
    link
    fedilink
    arrow-up
    8
    ·
    3 days 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

  • hotdogcharmer@lemmy.zip
    link
    fedilink
    arrow-up
    8
    ·
    3 days 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. 🤷‍♂️

  • sp3ctr4l@lemmy.dbzer0.com
    link
    fedilink
    English
    arrow-up
    7
    ·
    3 days ago

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

  • Sibbo@sopuli.xyz
    link
    fedilink
    arrow-up
    9
    arrow-down
    1
    ·
    3 days ago

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

  • gigachad@piefed.social
    link
    fedilink
    English
    arrow-up
    4
    ·
    3 days ago

    git config --global init.defaultBranch main

  • katy ✨@piefed.blahaj.zone
    link
    fedilink
    English
    arrow-up
    3
    ·
    3 days ago

    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.

  • 544 users / day
  • 2.13K users / week
  • 2.15K users / month
  • 2.15K users / 6 months
  • 1 local subscriber
  • 26.8K subscribers
  • 56 Posts
  • 435 Comments
  • Modlog
  • mods:
  • adr1an@programming.dev
  • Feyter@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.13
  • Modlog
  • Legal
  • Instances
  • Docs
  • Code
  • join-lemmy.org