git 冲突覆盖_解决合并冲突：强制覆盖所有文件

I am working on a git repository by myself (so yes, I know the implications and the warnings of doing this) and somehow one of the trees got a commit after being pushed when it shouldn't have.

Now I'm trying to pull back and it's complaining about hundreds of merge conflicts.

Is there a way to tell git to forcefully overwrite any and all files locally that are coming from the remote server? Is there a faster way than doing git reset --hard HEAD~1 and then doing the pull?

On that same note, is there a way to do the same with with a simple merge? Everything I've seen suggests to check out each and every file during the merge conflict resolution stage, but with hundreds of files it's just not possible to do so manually.

解决方案

There are three simple solutions to copy the last version that is in you remote repository, discarding all changes that yo