I have done some local changes in code stored in Git repo. I don't need these changes anymore, so I would like to discard them and get a clean copy from github.
When I did a Git pull it gave me a merge conflict error.
So, I did
git reset --hard
but that did not help. I also tried
but still when I try pull from github, it does not allow me to do so.
Can someone please suggest what would be the best approach to get the latest code from github. Should I just delete the local files and then do a git pull?