How to force `git merge`?

Question

I'm experiencing the "file name too long" error described in another question . I've already fixed the file name in a remote repo, and now I'm trying to merge in the changes from the remote that fix the name. However, git won't let me merge because it thinks I have uncommitted changes (the too-long-named file it can't create). Is there some way to force git to merge? Note that git status lists no modifications, besides printing the file name too long error, so I don't see how to satisfy git first locally. In particular, git does not report the file as rm'd or missing.

Answer 1

我能够通过执行git reset --hard <remote>/<branch>来解决问题。