Question

I am using Git on Windows.

After numerous local changes and committing them locally I performed a Git pull from our remote repository. I found that after doing this and having a few conflicts, large amounts of code that existed locally are now gone without any backup files created on disk (ie .LOCAL).

Is there a way to revert my state back to my local state before I did a remote pull?

Thanks

Answer 1

For retrieving the entire branch:

git reset --hard HEAD

or for individual files:

git checkout HEAD^ -- file1 file2 file3