Question

I have a submodule which I changed some local files. The original repository has been modified and I now wish to do a pull on the submodule, but I get an error saying that I will lose my changes.

How do I force git to ignore local changes and do the pull?

I know there are lot’s of similar questions to this, but I couldn’t find a question in stack overflow that answered my particular problem (specifically submodules).

Answer 1

git reset --hard does exactly that – discard all changes and return to HEAD.

Or you can use git stash and after pull – git stash apply to restore your changes over updated tree.

If a submodule contains another submodules, it can be done recursively

# reset current directory
git reset --hard
# reset all submodules
git submodule foreach --recursive git reset --hard