schlunker
  • Communities
  • Create Post
  • Create Community
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
cm0002@lemdro.id to Programmer Humor@programming.devEnglish · 2 days ago

When you screw up git

lemmy.zip

message-square
62
fedilink
726

When you screw up git

lemmy.zip

cm0002@lemdro.id to Programmer Humor@programming.devEnglish · 2 days ago
message-square
62
fedilink
alert-triangle
You must log in or register to comment.
  • Cevilia (she/they/…)@lemmy.blahaj.zone
    link
    fedilink
    English
    arrow-up
    96
    ·
    2 days ago

    Holy fuck, that’s a long phone number

    • √𝛂𝛋𝛆@piefed.world
      link
      fedilink
      English
      arrow-up
      61
      arrow-down
      1
      ·
      2 days ago

      It is a duplicated repeating error because this clownshow of a website is managed by squirrels and ducks. 1-800-273-8255 would be a valid US number. Doubling 273-8255 is not, but probably vibe coded under management that should be purged by these results.

      • GreenShimada@lemmy.world
        link
        fedilink
        arrow-up
        23
        ·
        2 days ago

        Hey! Don’t insult ducks like that! This clownshow website would be about 20% better if ducks were involved.

        • √𝛂𝛋𝛆@piefed.world
          link
          fedilink
          English
          arrow-up
          4
          ·
          2 days ago

          I don’t know. I was cursing at ducks an hour ago while trying to remember how to spell diatomaceous earth and the ducks were total fuckwits.

      • Whostosay@sh.itjust.works
        link
        fedilink
        arrow-up
        5
        ·
        2 days ago

        Why not 1800-SUICIDE?

        • √𝛂𝛋𝛆@piefed.world
          link
          fedilink
          English
          arrow-up
          12
          ·
          2 days ago

          intentions unclear. Am I calling For or Against

          • Whostosay@sh.itjust.works
            link
            fedilink
            arrow-up
            9
            ·
            2 days ago

            Your call.

            Buh dun tissss

        • Eager Eagle@lemmy.world
          link
          fedilink
          English
          arrow-up
          2
          ·
          edit-2
          1 day ago

          It exists too, it seems to be a support line from British Columbia, CA

          https://www.crisislines.bc.ca/services

        • locuester@lemmy.zip
          link
          fedilink
          English
          arrow-up
          5
          ·
          2 days ago

          It’s 1-800-APE-TALK

          • Whostosay@sh.itjust.works
            link
            fedilink
            arrow-up
            5
            ·
            2 days ago

            Lmao not willing to do the phone math rn, does that actually fit the numbers?

            • locuester@lemmy.zip
              link
              fedilink
              English
              arrow-up
              2
              ·
              2 days ago

              Yes.

              • Whostosay@sh.itjust.works
                link
                fedilink
                arrow-up
                2
                ·
                2 days ago

                That could be platformed.

                WAIT YOU HAVE SO MUCH TO LIVE FOR, have you tried ape talk?

                Well, I can’t say that I have.

    • Catoblepas@piefed.blahaj.zone
      link
      fedilink
      English
      arrow-up
      41
      arrow-down
      1
      ·
      2 days ago

      Well, that’s easy to remember! 0118, 999, 881, 999, 119, 725…3.

      • fedditter@feddit.org
        link
        fedilink
        arrow-up
        21
        ·
        edit-2
        2 days ago

        Did you see that ludicrious display last night??

        • OpenStars@piefed.social
          link
          fedilink
          English
          arrow-up
          14
          ·
          2 days ago

          Yes I did. Just put it over there with the rest of the fire.

          • kambusha@sh.itjust.works
            link
            fedilink
            arrow-up
            7
            ·
            2 days ago

            Your name is Morris Moss, is it not?

            • fedditter@feddit.org
              link
              fedilink
              arrow-up
              4
              ·
              2 days ago

              Your name is Morris Moss, is it not?

              • fedditter@feddit.org
                link
                fedilink
                arrow-up
                3
                ·
                2 days ago

                It is not.

      • serpineslair@lemmy.world
        link
        fedilink
        English
        arrow-up
        4
        ·
        1 day ago

        The irony is, I remember it perfectly.

    • guillem@aussie.zone
      link
      fedilink
      arrow-up
      10
      ·
      2 days ago

      It’s easier to remember if you sing it.

      • hakunawazo@lemmy.world
        link
        fedilink
        arrow-up
        2
        ·
        edit-2
        2 days ago

        A B C D E F G, I hang a noose on this tree. 𝅘𝅥𝅮𝆕

        But for real: You should reset hard the head of the git branch, not yours.

  • SkunkWorkz@lemmy.world
    link
    fedilink
    arrow-up
    29
    ·
    2 days ago

    “Proper way to commit after merge conflict” sounds like a robot trying to save a relationship after a bad sex experience

  • katy ✨@piefed.blahaj.zone
    link
    fedilink
    English
    arrow-up
    22
    ·
    2 days ago
    git reset --hard <commit-hash>  
    git push -f origin main  
    

    i didn’t see anything, officer

    • martinb@lemmy.sdf.org
      link
      fedilink
      arrow-up
      17
      ·
      2 days ago

      You should be forcibly kept away from production systems…

      • henfredemars@infosec.pub
        link
        fedilink
        English
        arrow-up
        10
        ·
        1 day ago

        We had an intern do this once. We changed our server config to make sure it wouldn’t accept such operations.

        • gravitas_deficiency@sh.itjust.works
          link
          fedilink
          English
          arrow-up
          3
          arrow-down
          6
          ·
          edit-2
          1 day ago

          It’s just a branch guard + properly implementing git user and team permission structures - you’re not “configuring a server”

          • marcos@lemmy.world
            link
            fedilink
            arrow-up
            4
            ·
            1 day ago

            I wonder what you think “configuring” means.

      • unalivejoy@lemmy.zip
        link
        fedilink
        arrow-up
        3
        ·
        1 day ago

        Never use --force. Always use --force-with-lease.

        • enbiousenvy@lemmy.blahaj.zone
          link
          fedilink
          English
          arrow-up
          2
          ·
          1 day ago

          I’ve mistyped that a couple of times to be --force-with-leash

          • unalivejoy@lemmy.zip
            link
            fedilink
            arrow-up
            4
            ·
            1 day ago

            git push origin master --force-with-leash

            Don’t do that to your master.

          • katy ✨@piefed.blahaj.zone
            link
            fedilink
            English
            arrow-up
            2
            ·
            edit-2
            1 day ago

            only do that in puppygit (with consent)

            • enbiousenvy@lemmy.blahaj.zone
              link
              fedilink
              English
              arrow-up
              1
              ·
              23 hours ago

              TIL thats a real thing https://github.com/catpuppyapp/PuppyGit

  • magic_lobster_party@fedia.io
    link
    fedilink
    arrow-up
    8
    ·
    1 day ago

    Keep your commits small. Merge often. That will reduce the likelihood of terrible merge conflicts.

    If you’re not sharing your work with your team mates for a long time, then you’re setting yourself up for trouble.

    • SpaceCowboy@lemmy.ca
      link
      fedilink
      arrow-up
      4
      arrow-down
      1
      ·
      1 day ago

      Also rebase is usually better than merge.

  • schnurrito@discuss.tchncs.de
    link
    fedilink
    arrow-up
    7
    ·
    1 day ago

    I remember when similar screenshots circulated for how to tell if i am running jdk or jre, which is even more surprising.

  • aliser@lemmy.world
    link
    fedilink
    arrow-up
    3
    ·
    1 day ago

    git is like a minefield. stray away even a little bit from standard path and you are done for. I had git multiple times throw some obscure errors at me when trying some commands and then trying to undo/recover. how’s “undo” is not a git command I don’t understand.

    • nialv7@lemmy.world
      link
      fedilink
      arrow-up
      1
      ·
      22 hours ago

      undo is a jj command ;)

  • jaschop@awful.systems
    link
    fedilink
    arrow-up
    33
    arrow-down
    1
    ·
    2 days ago

    It’s never too late to git merge --abort!

    • TheFriendlyDickhead@feddit.org
      link
      fedilink
      arrow-up
      23
      ·
      2 days ago

      But abortion is murder?!?!?!?!?

      • gravitas_deficiency@sh.itjust.works
        link
        fedilink
        English
        arrow-up
        8
        ·
        1 day ago

        🎶 every branch is sacred 🎶

  • 🇰 🌀 🇱 🇦 🇳 🇦 🇰 🇮 @pawb.social
    link
    fedilink
    English
    arrow-up
    13
    ·
    1 day ago

    calls suicide hotline to ask for tech support

    • CanadaPlus@lemmy.sdf.org
      link
      fedilink
      arrow-up
      3
      arrow-down
      2
      ·
      edit-2
      1 day ago

      Don’t hold your breath, they’re pretty mid at their actual job.

  • dream_weasel@sh.itjust.works
    link
    fedilink
    arrow-up
    8
    arrow-down
    2
    ·
    1 day ago

    No merges allowed. Rebase only.

    • dream_weasel@sh.itjust.works
      link
      fedilink
      arrow-up
      2
      ·
      1 day ago

      And if you can’t figure out how to rebase, I definitely don’t want you solving your own merge commit!

  • GreenKnight23@lemmy.world
    link
    fedilink
    arrow-up
    3
    ·
    1 day ago

    in life you commit to many things. you commit to yourself, to your partner, to happiness, to legacy.

    when we die, is that like a push to origin?

    when we die, do our commits all go to the big repo in the sky?

    is god the maintainer? when you pray is that like a bug report?

    so many questions…

  • Echo Dot@feddit.uk
    link
    fedilink
    arrow-up
    5
    ·
    edit-2
    1 day ago

    See I wasn’t really going to kill myself today, but the thought of dialing that long ass number is just to much.

  • kubica@fedia.io
    link
    fedilink
    arrow-up
    15
    ·
    2 days ago

    git out --never-come-back

    • errer@lemmy.world
      link
      fedilink
      English
      arrow-up
      9
      ·
      edit-2
      2 days ago

      git never --gonna-give-you-up

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

        git never --gonna-let-you-down

  • Anafabula@discuss.tchncs.de
    link
    fedilink
    arrow-up
    9
    ·
    2 days ago

    Jujutsu (which is compatible with git) has a nice conflict resolution flow that doesn’t break you workflow.

    Conflicts are encoded into the commits, so that there is never a weird in between state that you have to deal with immediately before being able to do anything else.
    Then you can use Jujutsu’s easier history manipulation to resolve the conflict in the conflicted commits.

    https://steveklabnik.github.io/jujutsu-tutorial/branching-merging-and-conflicts/conflicts.html

    And you could always jj undo if you did something you didn’t want to.

  • peoplebeproblems@midwest.social
    link
    fedilink
    English
    arrow-up
    7
    ·
    2 days ago

    Been there too OP. Not a good place.

    It’s usually easier to find another job, it will reset your mind, and fear won’t be driving you.

    Or you could just commit what you have, comment “YOLO” and auto resolve conflicts and push.

    • tomjuggler@lemmy.world
      link
      fedilink
      arrow-up
      2
      ·
      1 day ago

      I prefer to just delete the whole .git and start a new repository with the new version. We are pivoting the project, new name and new repo

  • dubyakay@lemmy.ca
    link
    fedilink
    arrow-up
    3
    ·
    edit-2
    1 day ago

    Google gives you results based on your prior search history.

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.

  • 1.85K users / day
  • 5.89K users / week
  • 9.79K users / month
  • 19.8K users / 6 months
  • 1 local subscriber
  • 26.8K subscribers
  • 1.83K Posts
  • 69.5K Comments
  • Modlog
  • mods:
  • Feyter@programming.dev
  • adr1an@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.5
  • Modlog
  • Instances
  • Docs
  • Code
  • join-lemmy.org