Git Question
Git recover uncommitted changes
I had a lot of local changes.
I just accidentally did
git merge another_branch
git reset --hard HEAD^
on a lot of work. :( with the intention I didn't want the merged changes in here.
How do I recover the original state?
No, the local changes were never committed/stashed.
No way?
Answer
If the changes had never been committed/stashed/staged, then you're out of luck. If they have, then you should be able to git your changes back by looking for them in git reflog.
Source (Stackoverflow)