• EfreetSK@lemmy.world
    191·
    2 days ago

    From the comments:

    I can’t wrap my mind around 10 people pushing changes to main all the time. It feels like a merge-conflict-rollback-preventing nightmare to me.

    That’s … literally what one of my colleagues is unironically advocating for over a decade. Despite us trying to explain to him that this might work for team of 2-3 people but is really a bad idea for team of 10+ developers, 5 or so testers, POs needing guarantee that they can deploy at any time and tools like Gitlab/Github. Thankfully we overruled him few years ago

  • vzq@lemmy.world
    13·
    2 days ago

    This is obviously crazy talk, but so is keeping feature branches alive over extended periods of time. Depending on the development tempo of your project and the number of people involved, you should figure out a way to land things into main (in pieces if needed) within a few days.

    • ulterno@programming.devEnglish
      1·
      2 days ago

      I had created a feature branch before leaving my previous company, completed the feature and uploaded a build for testing, after which it was supposed to be merged.

      Months passed and it has still been neither merged nor rejected.

    • vzq@lemmy.world
      4·
      2 days ago

      Back during the master/main debate I proposed going back to “trunk”, but there were too few of us old farts to make it stick.

      That said, I didn’t miss subversion and CVS even a bit. They were rough compared to modern source control. I did like both hg and bazaar better than git though.

    • Jesus_666@lemmy.worldEnglish
      3·
      2 days ago

      Real men use classic TFS. Real men then pursue a career in a different field so they don’t have to use TFS anymore.

    • DrewOPM
      8·
      2 days ago

      That’s the neat part: you don’t

      • brian@programming.dev
        1·
        1 day ago

        trunk based development generally still merges branches into a main one, see this. idk if only using main even has a name

        • onlinepersona@programming.dev
          1·
          21 hours ago

          Trust me, people still call it trunk based development. Just like “agile” has many forms, trunk based development does too.

          Managers will often read about some process, tech, or strategy and tout it as the solution to their problems without understanding context nor wanting to invest in what’s actually required for a successful implementation. For example trunk based development should have automated testing, a deployment and a fallback strategy. And if you’re working on something with hefty features that you can’t slice, feature flags or something similar are probably required. Not giving the team time to develop a strategy to implement that is a great way to mess up a product.

          Anti Commercial-AI license

    • vzq@lemmy.world
      63·
      2 days ago

      Scary woke branch name triggered you? Need to get back to your safe space?

      • NostraDavid@programming.dev
        1·
        17 hours ago

        Nah, just annoyed that Microsoft, a massive corporation that has a tendency of fucking people over, is now fucking with me by changing the default.

        Having git get the option to change the default from master to whatever you choose as a user is great! More options is more better. Having a massive corporation fuck with the defaults because (AFAIK) a single person made a complaint about it does not gel with me.

        PS: How the fuck is main “scary woke”? Is this that “brainrot” I’ve heard about?

      • FizzyOrange@programming.dev
        71·
        2 days ago

        I dunno about NostraDavid, but I don’t object to main as a name. It’s an obviously better name (let’s be honest Git is terrible at naming). If it had been the name from the start it would have been fine.

        The problems are a) changing the name was - and continues to be - a persistent minor pain, and b) it was changed for really really stupid reasons! Mainly the latter. It’s painful when people are being idiots even if it doesn’t directly affect you.

        It’s kind of like my objection to religion (at least Christianity in the UK). It’s not really doing any harm, but it’s just so stupid. (I don’t blame Christians; I was raised one so I know first hand how it tricks you into belief.)

        • NostraDavid@programming.dev
          2·
          17 hours ago

          The problems are a) changing the name was - and continues to be - a persistent minor pain, and b) it was changed for really really stupid reasons!

          Yeeeeees! Somebody gets it! I’ll add to it that it’s also a massive corporation that’s been pushing it! A massive corporation that’s known for "Embrace, extend, and extinguish" (EEE), because that’s how they fucked over fair competition. I like parts of Microsoft, but I don’t trust one bit of them.