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

  • cliffhanger407@programming.dev
    link
    fedilink
    English
    arrow-up
    23
    ·
    1 year ago

    Joined on a project and the unsupervised junior devs had branches for each developer, even if they were working on the same features. They were copying and pasting each others code into their personal branches to stay up to date.

    Spaghetti commits took a while to unwind.

    • halcyon
      link
      fedilink
      English
      arrow-up
      1
      ·
      1 year ago

      git checkout stable062023, git merge feat_member1 --no-ff? Isn’t that the point of --no-ff to rewrite a bunch of commits into being associated instead with a single feature commit?