idea git refusing to merge unrelated histories

这个错误通常是由于两个独立的 git 仓库尝试合并产生的。你可以尝试使用 --allow-unrelated-histories 选项来合并它们。具体做法是：

git pull origin master --allow-unrelated-histories

这个命令将从远程仓库的 master 分支拉取代码，并允许合并两个独立的历史。如果你仍然遇到问题，可以尝试将你的本地仓库与远程仓库进行手动合并。

相关问题

idea git merge refusing to merge unrelated histories

If you encounter the "refusing to merge unrelated histories" error when trying to merge branches in Git, it typically means that Git is unable to automatically merge the branches because it cannot find a common ancestor commit.

To resolve this issue, you can use the `--allow-unrelated-histories` flag with the `git merge` command. Here are the steps to follow:

1. Make sure you are in the branch where you want to merge the other branch.

   git checkout <branch-name>

2. Merge the other branch with the `--allow-unrelated-histories` flag.

   git merge <other-branch-name> --allow-unrelated-histories

3. Resolve any conflicts that may arise during the merge process.
Git will automatically attempt to merge the changes but if conflicts occur, you need to manually resolve them.

4. Commit the merge changes.

   git commit -m "Merge branches"

After following these steps, the branches should be successfully merged despite having unrelated histories.

idea Git Pull Failed refusing to merge unrelated histories

当您在使用Git Pull命令时，如果出现“refusing to merge unrelated histories”错误，这意味着您正在尝试合并两个不相关的Git仓库。这通常发生在您尝试将两个不同的Git仓库合并为一个仓库时。

为了解决这个问题，您可以使用以下命令：

git pull origin master --allow-unrelated-histories

这个命令将允许您合并两个不相关的Git仓库。请注意，这可能会导致一些冲突，您需要手动解决这些冲突。