• InvalidName2@lemmy.zip
    link
    fedilink
    arrow-up
    1
    ·
    1 month ago

    I’m a purist. The stable and persistent main branch, regardless of what you want to call it, should always and only ever be exactly the same as the code that’s currently deployed to the production server. Generally the only exception is for the short duration between a push and deployment under normal circumstances.

    But every job I’ve ever had, there’s at least one maverick who knows git way better than anybody else and is super advanced, so they do their own thing which is totally better in a million different ways but essentially fucks everybody else over. And I’m not even here to say they aren’t smarter than the rest of us and I’m sure that somehow their process is better than what we currently do. But with version control, my anecdotal experience has been that the most important things for running smoothly are: consistency and having everybody on the same page. Process doesn’t need to be perfect, maximally efficient, bleeding edge, etc to achieve that.

    • zorro@lemmy.world
      link
      fedilink
      English
      arrow-up
      1
      ·
      1 month ago

      All merges to main auto deploy to staging. Tagged merges to main also go to production.

            • limer@lemmy.ml
              link
              fedilink
              arrow-up
              0
              ·
              1 month ago

              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.

              • TrickDacy@lemmy.world
                link
                fedilink
                arrow-up
                0
                ·
                1 month ago

                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

                • limer@lemmy.ml
                  link
                  fedilink
                  arrow-up
                  1
                  ·
                  1 month ago

                  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

          • SqueakyBeaver@lemmy.blahaj.zone
            link
            fedilink
            arrow-up
            0
            ·
            1 month ago

            I like the actual look of the word “main” more than I do the word “master”. I think it’s because it looks like a neat semi-circle

          • zarkanian@sh.itjust.works
            link
            fedilink
            arrow-up
            0
            ·
            1 month ago

            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?

            • morpheus17pro@lemmy.ml
              link
              fedilink
              English
              arrow-up
              1
              ·
              1 month ago

              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).

              • timbuck2themoon@sh.itjust.works
                link
                fedilink
                English
                arrow-up
                2
                ·
                1 month ago

                Agree with this. Never changed from master as it would cost the business money to do so (and involve a ton of headaches) for no reason. Thankfully the whole dept agreed on that.

  • potoo22@programming.dev
    link
    fedilink
    arrow-up
    0
    ·
    1 month ago

    We have a deployed branch. It doesn’t get merged into master until it gets reviewed… the technical debt got too big so it never gets reviewed and we just keep branching off deployed