Git recover uncommitted changes

Question

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

Answer 1

Foy anyone who is facing this problem in ide's, there is a solution. Search For the ide editor history files of your ide. I had a problem with android studio so here i will give you a solution for android studio.

For eg: In android studio you can always see the previous files , by right clicking on project folder->LOcal History->Show History.

You can see the change history of files and you can also open the files and compare it with new files side by side. If you need old code just copy paste it from there.