• @tetris11@lemmy.ml
    link
    fedilink
    36
    edit-2
    1 month ago
    cd ~/repos/work-project27
    git checkout dev
    git branch new_feature
    ### code for a few hours, close laptop, go to sleep, next morning
    git checkout dev
    ### code for a few more hours, close laptop go to sleep, next morning
    ## "oh fuck, I already implemented this in new_feature but differently"
    git checkout dev
    git diff new_feature
    ## "oh no. oh no no no. oh fuck. I can't merge any of this upstream and my history is borked."
    git clone git@workhub:work/work-project work-project28
    cd ~/repos/work-project28
    
  • Tamlyn
    link
    fedilink
    171 month ago

    At university there were some students that want to manage projekts in could storange. That was just stupid but i didn’t know it better at that time.

    • @Jyek@sh.itjust.works
      link
      fedilink
      229 days ago

      I’m pretty sure it means, they copy and paste the project file and iterate the version number manually.

    • @frezik@midwest.social
      link
      fedilink
      161 month ago

      I “love” how JavaScript has slowly rediscovered every piece of functional programming wisdom that was developed before 1980.

    • Thadah D. DenyseOP
      link
      fedilink
      51 month ago

      While TFS did support Git, I had to deal with the much worse TFVC for a long while, up until Azure DevOps came along.

  • @Ugurcan@lemmy.world
    link
    fedilink
    7
    edit-2
    1 month ago

    It’s actually a pretty good idea to have a full system snapshot time to time, where the project can compile successfully, for future Virtual Machine use. It’s usually easier to spin a VM than setting up the whole dev environment from scratch.

    • @lars@lemmy.sdf.org
      link
      fedilink
      329 days ago

      And when it’s release, then you rename it to

      MyProject - Copy v2.bak new NEW (3) FINAL.2-19-24/

      and then at the next standup, we all ponder how we can rename it to

      MyProject - Copy v2.bak new NEW (3) FINAL.2/19/24/

      because the team lead needs m/d/yy names with forward slashes

    • @nogooduser@lemmy.world
      link
      fedilink
      English
      530 days ago

      It’s definitely up with Git in my opinion. I much prefer the branching in Mercurial.

      It’s certainly very offensive to lump it in the same band as SVN and TFVC.

        • @nogooduser@lemmy.world
          link
          fedilink
          English
          230 days ago

          It’s not the mechanism of branching that I prefer.

          It’s the fact that Mercurial tags the commit with the name of the branch that it was committed to which makes it much easier to determine whether a commit is included in your current branch or not.

          Also, Mercurial has a powerful revision search feature built in which I love (https://www.mercurial-scm.org/doc/hg.1.html#revisions).

          • @balsoft@lemmy.ml
            link
            fedilink
            229 days ago

            It’s the fact that Mercurial tags the commit with the name of the branch that it was committed to which makes it much easier to determine whether a commit is included in your current branch or not.

            Isn’t this trivial in Git too? git branch --contains COMMIT ?

            • @Alphare@lemmy.world
              link
              fedilink
              129 days ago

              Sure, if you want to do it once, but Git still has to compute that information (save for a new-ish cache that is just that, a cache). But that is not the point really, the point is that Mercurial’s graph Is the same (topologically) everywhere, which is not the case in Git because branches (and thus remotes) have different names. So saying that a branch contains a commit is not the same as a commit being on a branch. There are a bunch of great properties that emerge from this but it’s too long for this comment and I should actually properly write this down at some point this year.

      • @Alphare@lemmy.world
        link
        fedilink
        430 days ago

        Given that Git and Mercurial were both created around April 2005 to serve the same purpose by very similar people for the same reason… I’d say it’s fair!

    • Echo Dot
      link
      fedilink
      529 days ago

      It’s one of those things that’s hard to really understand why it’s so useful, until you actually use it.

  • @yogsototh@programming.dev
    link
    fedilink
    529 days ago
    cp $fic $fic.$(date -Iseconds)
    git commit -a -m "save at $(date -Iseconds)"
    # edit $fic
    git commit -a -m "save at $(date -Iseconds)"
    git push -f