After git reset --hard HEAD, git pull still says: Untracked working tree file ... would be overwritten by merge

Question

After git reset --hard HEAD, git pull says: Untracked working tree file ... would be overwritten by merge

any ideas?

I did try a git fetch and git fetch --all already...

Answer 1

If you just want to update your local to the origin's state, you could use described here solution:

$ git fetch origin

$ git reset --hard origin/master

Answer 2

you have untracked files. Simply

git stash -u

to stow them away in the stash and get a clean work tree (-u specifies that you want to stash modifications along with new files). After you pull, merge, rebase or whatever, you can

git stash pop

to get them back.