The Bard's Lemmy
  • Communities
  • Create Post
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
Thadah D. Denyse@lemmy.blahaj.zone to Programmer Humor@programming.devEnglish · 1 year ago

Version Control

lemmy.blahaj.zone

message-square
39
link
fedilink
307

Version Control

lemmy.blahaj.zone

Thadah D. Denyse@lemmy.blahaj.zone to Programmer Humor@programming.devEnglish · 1 year ago
message-square
39
link
fedilink
alert-triangle
You must log in or # to comment.
  • tetris11@lemmy.ml
    link
    fedilink
    arrow-up
    30
    ·
    1 year 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
    
    • Programmer Belch@lemmy.dbzer0.com
      link
      fedilink
      English
      arrow-up
      14
      ·
      1 year ago

      Truly a Sisyphus tale

      • tetris11@lemmy.ml
        link
        fedilink
        arrow-up
        15
        ·
        1 year ago

  • mEEGal@lemmy.world
    link
    fedilink
    arrow-up
    13
    arrow-down
    2
    ·
    1 year ago

    the last one is just immutability, praised in modern JS / TS, albeit at the repo level

    • frezik@midwest.social
      link
      fedilink
      arrow-up
      14
      ·
      1 year ago

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

      • expr@programming.dev
        link
        fedilink
        arrow-up
        2
        ·
        1 year ago

        Kind of, though they honestly just do pretend immutability. Object references are still copied everywhere.

        • 0101100101@programming.dev
          link
          fedilink
          English
          arrow-up
          5
          ·
          1 year ago

          All of javascript is kinda just pretend.

        • frezik@midwest.social
          link
          fedilink
          arrow-up
          2
          ·
          1 year ago

          I find you need the whole ecosystem to support immutability to make it work. Every library needs to be based around it. Elixir is about the only modern option that does.

  • Ugurcan@lemmy.world
    link
    fedilink
    arrow-up
    8
    arrow-down
    2
    ·
    1 year 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.

  • Alphare@lemmy.world
    link
    fedilink
    arrow-up
    5
    ·
    1 year ago

    As one of the maintainers of Mercurial, I take great offense in this meme. ;)

    • nogooduser@lemmy.world
      link
      fedilink
      English
      arrow-up
      5
      ·
      1 year 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.

      • Alphare@lemmy.world
        link
        fedilink
        arrow-up
        4
        ·
        1 year 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!

  • brandon@lemmy.ml
    link
    fedilink
    English
    arrow-up
    5
    ·
    1 year ago

    MyProject - Copy v2.bak new NEW (3)/

  • yogsototh@programming.dev
    link
    fedilink
    arrow-up
    5
    ·
    1 year 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
    
    • ZILtoid1991@lemmy.world
      link
      fedilink
      arrow-up
      2
      ·
      1 year ago

      cp?💀

      • optional@sh.itjust.works
        link
        fedilink
        arrow-up
        1
        ·
        1 year ago

        cp is short for create packup

  • parpol@programming.dev
    link
    fedilink
    arrow-up
    4
    ·
    1 year ago

    Couldn’t add perforce to the list because someone else was checking it out, I see.

  • 0101100101@programming.dev
    link
    fedilink
    English
    arrow-up
    3
    ·
    1 year ago

    CVS is gonna make a comeback! I tell ya!

  • 0101100101@programming.dev
    link
    fedilink
    English
    arrow-up
    3
    ·
    1 year ago

    I do miss the tags of SVN that would replace certain strings on each commit such as the date, a version number, etc.

  • nogooduser@lemmy.world
    link
    fedilink
    English
    arrow-up
    3
    ·
    1 year ago

    And worse than all of those options is Visual Sourcesafe.

    • Valmond@lemmy.world
      link
      fedilink
      arrow-up
      3
      ·
      1 year ago

      Fox Pro!

      Shrug

  • Matriks404@lemmy.world
    link
    fedilink
    arrow-up
    3
    ·
    1 year ago

    Git is so ready to understand, that I don’t understand how people work without it.

  • PoolloverNathan@programming.dev
    link
    fedilink
    arrow-up
    3
    arrow-down
    1
    ·
    1 year ago

    btrfs sub snap -r

    • mcmodknower@programming.dev
      link
      fedilink
      arrow-up
      1
      ·
      1 year ago

      Isn’t that just git with more steps and harder to share?

      • PoolloverNathan@programming.dev
        link
        fedilink
        arrow-up
        2
        ·
        1 year ago

        It’s equivalent to cp -r, but:

        • the copy is read-only
        • reuses unchanged files
        • easier to share (btrfs sub send)
        • mcmodknower@programming.dev
          link
          fedilink
          arrow-up
          1
          ·
          1 year ago

          Sounds just like git (unless you do some special operations to change the copies)

    • magikmw@lemm.ee
      link
      fedilink
      arrow-up
      1
      ·
      1 year ago

      With properly configured subvolumes, I’ll allow it.

  • Carighan Maconar@lemmy.world
    link
    fedilink
    arrow-up
    2
    ·
    1 year ago

    I miss mercurial and it’s far more sensical flags and commands…

    • Alphare@lemmy.world
      link
      fedilink
      arrow-up
      2
      ·
      1 year ago

      It’s still here and very much alive in case you were curious.

      • nogooduser@lemmy.world
        link
        fedilink
        English
        arrow-up
        1
        ·
        1 year ago

        The only reason that we stopped using Mercurial is that Microsoft used Git in Azure DevOps. I still wish that they’d supported Mercurial instead of or as well as Git.

    • nogooduser@lemmy.world
      link
      fedilink
      English
      arrow-up
      1
      ·
      1 year ago

      I really liked Mercurial too. It was much easier to follow branches to find out if a branch included a commit.

  • Jade@lemmy.blahaj.zone
    link
    fedilink
    English
    arrow-up
    1
    ·
    1 year ago

    The last one can easily describe Django. Feels like depending on the code base/your mistakes/people you work with can easily turn a normal project into a project where majority of the files is just migration files.

  • almost1337@lemm.ee
    link
    fedilink
    arrow-up
    1
    ·
    1 year ago

    Perforce Helix, here I come!

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.

  • 161 users / day
  • 1.85K users / week
  • 3.95K users / month
  • 9.1K users / 6 months
  • 1 local subscriber
  • 32.6K subscribers
  • 1.74K Posts
  • 30.8K Comments
  • Modlog
  • mods:
  • Feyter@programming.dev
  • adr1an@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.14
  • Modlog
  • Instances
  • Docs
  • Code
  • join-lemmy.org