We all have been there… For the beginner it’s easy to mess things up. What are your horror stories with Git?

Link to xkcd

  • @[email protected]
    link
    fedilink
    English
    14
    edit-2
    1 year ago

    Me doing a massive rebase

    Find out at the end I royally messed up somewhere and it does not build at all.

    I did not push changes to remote before rebaseing

    I did not push changes to remote before rebasing? suprised picachu

    • @[email protected]OPM
      link
      fedilink
      English
      111 year ago

      You can still recover from that (reflog). But with limited experience, it’s a chilling story :D

    • @[email protected]
      link
      fedilink
      English
      91 year ago

      I was going to say… I’m pretty good with git, and rebasing still gives me anxiety haha

      • @[email protected]
        link
        fedilink
        English
        31 year ago

        Honestly I am now a huge fan of having lots of tiny repositories. It simplifies ci/cd, forces you to split code into logical blocks with stable interfaces, and limits frequency and scope of conflicts.

      • JackbyDev
        link
        fedilink
        English
        11 year ago

        Prior to rebasing I still do git tag -f undo in case I screw up so I can do git reset --hard undo if I mess up. I don’t understand reflog lol.

    • @anupcshan
      link
      English
      11 year ago

      For any major operations like this, I always save the current commit with a tag. Very easy to get back to the original commit in case something blows up.