git - 添加 Git 远程后 "fatal: refusing to merge unrelated histories"

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

您需要先重置或提交您的更改:

git reset --hard

或:

git commit -m "saving changes..."

然后你可以这样做:

git pull origin master --allow-unrelated-histories