Git pull deleted uncommitted changes

Question

I just made a new repository on github. Starting with a folder full of files, the steps I did were:

git init
git add -A
git remote add origin ...

#Now pull in the first commit that github made
git pull origin master

#Check everything is OK
ls

Eek! All my files have disappeared! What happened? Can I get them back?

Answer 1

For me the following worked:

1. Go to the affected file.
2. Right click and choose Local History and select Show History. From there you can see the history of changes made to the file, and then choose the time you want to bring back the file to.
3. You will get two windows with the left one having >>. Click on all the >> and this will send your changes to the right window.
4. Close the window and here you go with your file restored to where you wanted it to be.

I hope it helped!