3 ms·

While complaining that Git is haaaard.

• adastra22 4y ago
  Well git is hard tho
  • marginalia_nu 4y ago
    It's easy if you always do exactly the right thing in the right order and never make mistakes, but if you for example want to undo a git merge[1], god have mercy. [1] https://opensource.apple.com/source/Git/Git-26/src/git-htmldocs/howto/revert-a-faulty-merge.txt https://opensource.apple.com/source/Git/Git-26/src/git-htmld...
    • psychoslave 4y ago
      In doubt, I create a new branch from the main one, and test it goes when merging the one holding changes. It something goes wrong, at least the main branch is unaffected. Of course, you must already have some intuition that something could go wrong. :D
      • deleted 4y ago
        [deleted]
    • imetatroll 4y ago
      Reflog lets you see where HEAD has traveled from. Just go back in time. This isn't actually a hard problem to solve. If that sounds difficult just create a branch prior to merging so that you know where to reset your failed branch to.
      • BeeOnRope 4y ago
        They are trying to solve this problem without rewriting the branch.
• speed_spread 4y ago
  It's not that hard, it's actually easy. Very Easy to get into a devolved state where the shortest path back to sanity is to clone the whole repo from scratch.