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
    111 year ago

    Apparently git let’s you push two completely independent histories into one repo if you force push and will happily let you go about your business until you try to merge.

    I found this out when an intern copied the code, initiated a new repo, worked off that repo, force pushed into remote, kept working on his branches. Absolutely not his fault, he should have had help. But I had to edit history and rewrite the parent of a commit to unite the family lines!

    Fun to learn that you can create that problem and also there’s a “way” to fix it.

    • JackbyDev
      link
      fedilink
      English
      21 year ago

      I believe I remember reading that in the official git repository a totally orphaned branch got merged. So if it can accidentally happen to the official team then I totally buy this.