• NocturnalMorning@lemmy.world
    91·
    9 hours ago

    Yeah, imagine you accidently commit over weeks of work, or hell, if it’s the main branch, and you deleted the other origin branch prior to merging, it could be a lot more than a few weeks worth of work. The revert to a previous commit… shutters.

    • wise_pancake@lemmy.ca
      1·
      26 minutes ago

      That’s when you call in a wizard.

      They do git necromancy and sacrifice a goat to the reflog to recover your code

    • WimpyWoodchuck@feddit.org
      13·
      8 hours ago

      I don’t know if you’re joking, but in case you’re not: git reflog and git reset --hard HEAD@{n} is your friend. You can undo almost anything. Deleted commits and branches aren’t really deleted. Remotely deleted branches can be pushed again.

      Except for an (accidental) git restore/git reset. Those are permanent and can’t be undone.

      • rooroo@feddit.orgEnglish
        4·
        6 hours ago

        Even git reset can be undone by a lot of editors. At least IntelliJ has an excellent local history that works much like git. Sure it’s a pain if you touched several files but that’ll teach you to atomify your commits.

        Edit: Plus, git reset itself does nothing of note really, but I’m sure you know. Needs the —hardflag to do any meaningful damage.