致命：添加 git remote 后拒绝合并不相关的历史记录

Question

我已将远程存储库添加到我正在使用的文件夹中：

git remote add origin https://github.com/<username>/<repo>.git

如果我输入：

git pull origin master

我明白了：

From https://github.com/<username>/<repo>
    * branch            master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

---

我也试过了：

$ git pull origin master --allow-unrelated-histories

但我明白了：

From https://github.com/...
    * branch            master     -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
    <files>
Please commit your changes or stash them before you merge.
Aborting

Answer 1

您需要先reset 或commit 进行更改：

git reset --hard

或：

git commit -m "saving changes..."

那么你可以这样做：

git pull origin master --allow-unrelated-histories