Git - 重置本地更改

Question

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

git stash

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?

Answer 1

我会做：

git reset --hard {remote_name_here}/{branch_name_here}

Answer 2

Try:

git checkout -f

For a great discussion of the differences between git reset and git checkout, see:

https://git-scm.com/book/en/v2/Git-Tools-Reset-Demystified#_git_reset

Answer 3

If you just want to get the latest code pushed on remote, you can do that.

rm -rf ./gitProject

git clone yourRemoteRepo

Answer 4

If you want to leave out all your local changes and get only those from github you can just delete your .git folder and reinitialize it, like that :

rm -rf .git
git init
git remote add origin http://yourGithubUrl.com
git pull