• red_tomato@lemmy.world
    link
    fedilink
    arrow-up
    65
    ·
    edit-2
    8 hours ago

    Another movie pitch:

    Due to management decision, a code freeze has been mandated to the main branch. 50 feature branches have accumulated waiting to be merged.

    Management has now finally approved to lift the code freeze - but only for 24 hours. Will the poor engineering team manage to merge all feature branches in time?

    • Jesus_666@lemmy.world
      link
      fedilink
      arrow-up
      26
      ·
      edit-2
      5 hours ago

      Here’s one for a TV show.

      In 2022, a crack quality assurance team was made redundant by a CTO for a botched product launch they didn’t commit.

      These men promptly escaped from a maximally unstable job market to the LinkedIn underground.

      Today, still wanted by recruiters, they survive as soldiers of fortune.

      If you have a broken codebase, if no one else can help, and if you can find them, maybe you can hire the QA-team.

    • ugo@feddit.it
      link
      fedilink
      arrow-up
      7
      arrow-down
      1
      ·
      edit-2
      5 hours ago

      Very easy: merge everything, fix after the feature freeze. It’s a feature freeze, not a bugfix freeze.

      Edit: wait you said code freeze, my bad. Still, merge everything. If stuff doesn’t work after the freeze, management will unfreeze for fixes. Or they freeze a non-working product. Do stupid management, get stupid results. Not on me to make idiotic processes work.

    • grue@lemmy.world
      link
      fedilink
      arrow-up
      10
      ·
      6 hours ago

      Merging all the feature branches in time is easy.

      Having the project compile afterwards is hard.

    • Otter@lemmy.ca
      link
      fedilink
      arrow-up
      16
      ·
      8 hours ago

      Is there a robust test suite?

      Merge, test, merge, test, patch, merge, test

  • sbird@sopuli.xyz
    link
    fedilink
    English
    arrow-up
    13
    ·
    7 hours ago

    My question would be for what time zone? That seems like an important detail

  • Otter@lemmy.ca
    link
    fedilink
    arrow-up
    33
    ·
    9 hours ago
    rm -rf *
    
    git add -A
    git commit -m "oops."
    
    rm -rf .git
    git init
    git add .
    git commit -m "bye."
    
    git push origin main --force
    
      • Otter@lemmy.ca
        link
        fedilink
        arrow-up
        5
        ·
        8 hours ago

        Oh good point 🤦

        So maybe instead, we can clear all local + remote branches and tags, create a blank branch, delete main, rename the blank branch to main, then delete .git

        Although the OP says that we can merge anything, and we might not have access to mess with branches

    • Otter@lemmy.ca
      link
      fedilink
      arrow-up
      11
      ·
      9 hours ago

      I’m not sure about the git history wipe, I can’t test it myself right now