git reset - 硬头HEAD不工作+拉-s递归-X他们仍然是错误

Question

$ git fetch
$ git reset --hard HEAD
Checking out files: 100% (1806/1806), done.
HEAD is now at 2f557c9 Upload changes from public server
$ git pull -s recursive -X theirs

给

Auto-merging web/media/images/page-slider/salafitness1.jpg
Automatic merge failed; fix conflicts and then commit the result.

存在很多冲突 - 如何强制恢复存储库版本？

git rebase master
git reset --hard HEAD
git pull

给： 自动合并失败;修复冲突，然后提交结果。

git fetch origin
git reset --hard origin/master
git clean -f

工作正常