• nous@programming.dev
    link
    fedilink
    English
    arrow-up
    10
    arrow-down
    1
    ·
    3 months ago

    I have never had git get into a state I cannot get out of. Even if that is a reset, checkout or clean. And those are very rare. How are people breaking things so often.

    Learn the tools you use daily, it saves you a lot of headache in thelong term.

    • Ephera@lemmy.ml
      link
      fedilink
      arrow-up
      6
      ·
      3 months ago

      Oh yeah, but I’m talking about the internal Git state just genuinely being broken, for example: https://stackoverflow.com/questions/14448326/git-commit-stopped-working-error-building-trees
      Ultimately, if you spend half an hour debugging that, it just starts being a waste of time compared to cloning anew.

      As for how to merge, yes, one should learn that. The problem is that the complexity of the code changes adds on top of whatever insecurities you might still have with Git.
      I did put “inexperienced” in braces there, because even as an experienced dev, merges are sometimes just not worth doing. In that case, you could just checkout the branch a second time, but well, still not that different.

    • RobotZap10000@feddit.nl
      link
      fedilink
      arrow-up
      1
      ·
      3 months ago

      Step 1. Forget to push local commits

      Step 2. Push commits from another machine

      Step 3. Pull from remote om the first machine

      I’m a bit of a noob, I often do this when I get too careless.

      • nous@programming.dev
        link
        fedilink
        English
        arrow-up
        2
        ·
        3 months ago

        That should not break things though. Maybe get a merge conflict that you need to sortout at worst. This is essentially the constant state of working with other people on a project.