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

  • MajesticFlame@lemmy.one
    link
    fedilink
    English
    arrow-up
    11
    ·
    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

    • TheRealBoner
      link
      fedilink
      English
      arrow-up
      9
      ·
      1 year ago

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

      • MajesticFlame@lemmy.one
        link
        fedilink
        English
        arrow-up
        3
        ·
        1 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@programming.dev
        link
        fedilink
        English
        arrow-up
        1
        ·
        1 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.