Git refusing to merge unrelated histories on rebase

ID : 206

viewed : 103

Tags : gitrebasegit





Top 5 Answer for Git refusing to merge unrelated histories on rebase

vote vote

100

The default behavior has changed since Git 2.9:

"git merge" used to allow merging two branches that have no common base by default, which led to a brand new history of an existing project created and then get pulled by an unsuspecting maintainer, which allowed an unnecessary parallel history merged into the existing project. The command has been taught not to allow this by default, with an escape hatch --allow-unrelated-histories option to be used in a rare event that merges histories of two projects that started their lives independently.

See the Git release changelog for more information.

You can use --allow-unrelated-histories to force the merge to happen.

vote vote

82

In my case, the error was just fatal: refusing to merge unrelated histories on every try, especially the first pull request after remotely adding a Git repository.

Using the --allow-unrelated-histories flag worked with a pull request in this way:

git pull origin branchname --allow-unrelated-histories 

As per 2.9.0 release notes - git pull has been taught to pass the --allow-unrelated-histories option to underlying git merge

vote vote

76

Try the following command:

git pull origin master --allow-unrelated-histories 

This should solve your problem.

vote vote

63

I got this error when I set up a local repository first. Then I went to GitHub and created a new repository. Then I ran

git remote add origin <repository url> 

When I tried to push or pull, I got the same fatal: unrelated_histories error every time.

Here is how I fixed it:

git pull origin master --allow-unrelated-histories git merge origin origin/master ... add and commit here... git push origin master 
vote vote

57

For this, enter the command:

git pull origin branchname --allow-unrelated-histories 

For example,

git pull origin master --allow-unrelated-histories 

Reference:

GitHub unrelated histories issue

Top 3 video Explaining Git refusing to merge unrelated histories on rebase







Related QUESTION?