我正在尝试将我的 github 分叉存储库与原始存储库同步。我已按照github 页面上的说明进行操作。但是当我尝试将我自己的主分支与上游合并时，它说：
$ git merge upstream/master
error: Your local changes to the following files would be overwritten by merge:
... a list of files ...
Please, commit your changes or stash them before you can merge.
Aborting
就是这样，当我git commit说nothing to commit (working directory clean)！
我错过了什么？