You're viewing a single thread.
That's not a mistake git can do that to people. Especially those who have never used git via command line.
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.
Thatโs when you call in a wizard.
They do git necromancy and sacrifice a goat to the reflog to recover your code
Ah, yes, the reflog incantation. It is said that it can be performed only by those who have rebased on an hard reset origin.
I don't know if you're joking, but in case you're not:
git reflogandgit 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.Except for an (accidental)
git restore/git reset. Those are permanent and can't be undone.Unless, you didn't close your editor before doing so, in which case, you can just save it again.
I'm not talking about IDEs.
Even Kate gives you the option to either discard the deleted document/changes or keep them and save again.Even
git resetcan 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 resetitself does nothing of note really, but Iโm sure you know. Needs theโhardflag to do any meaningful damage.
Its even scarier when master branch is prod
Don't tell me ghost stories right now, it's almost my bedtime.