During git rebase origin/development the following error message is shown from Git:
fatal: refusing to merge unrelated histories
Error redoing merge 1234deadbeef1234deadbeef
My Git version is 2.9.0. It used to work fine in the previous version.
How can I continue this rebase allowing unrelated histories with the forced flag introduced in the new release?
You can use --allow-unrelated-histories to force the merge to happen.
The reason behind this is that 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-historiesoption 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.
More information can be found in this answer.
--allow-unrelated-histories permanently? –
Hyohyoid git pull as well. Was in that "rare event that merges histories of two projects that started their lives independently". git --work-tree="." pull --allow-unrelated-histories –
Viehmann --allow-unrelated-histories it resulted in a merge conflict. What I really needed, therefore, in this case, was not git pull --allow-unrelated-histories upstream master, but rather was a hard reset (DANGER you'll overwrite local files) to make my local master once again fully track the upstream master: git reset --hard upstream/master was perfect. Source: stackoverflow.com/questions/1125968/… –
Cini git fetch --all first too. That makes the full answer git fetch --all to fetch the latest upstream master and update my remote tracking branches, such as upstream/master, and then git reset --hard upstream/master to reset my HEAD on my local, checked-out master to point to the remote-tracking branch I just fetched: upstream/master. –
Cini export auh="--allow-unrelated-histories", then you could call git pull $auh. Otherwise maybe git config has on option for it, not sure –
Bloodsucker git config --global alias.merge 'merge --allow-unrelated-histories'? –
Degauss license or README.md file. –
Banerjee 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
git clone. –
Vaticide --allow-unrelated-histories ?? –
Wollis --allow-unrelated-histories or the git clone tip. help.github.com/en/articles/… –
Flintshire Try the following command:
git pull origin master --allow-unrelated-histories
This should solve your problem.
tl:dr –
Leguminous master branch into the current branch. Once that is done, the current branch and master branch will now have a shared history and you will now be able to open a pull request + merge from current branch to master branch. –
Radborne 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
.git folder, ran git init and did what Adithya said, except for the merge part. –
Horseplay Following the error when doing a git pull origin master:
fatal: refusing to merge unrelated histories
# It could be master
git pull origin master --allow-unrelated-histories
# Or main
git pull origin main --allow-unrelated-histories
# Or just try with origin
git pull origin main --allow-unrelated-histories
If it opens the nano editor you can just save and close with Ctrl + X.
git push
Keep in mind that this error could happen in other operation performed between 2 different branches. For instance when trying to merge 2 branches which don't have related history which makes sense.
Eitherway, simply add --allow-unrelated-histories should again, do the trick
git merge some_branch --allow-unrelated-histories
The “fatal: refusing to merge unrelated histories” Git error occurs when two unrelated projects are merged (i.e., projects that are not aware of each other’s existence and have mismatching commit histories).
The get-merge command (from Git documentation): --allow-unrelated-histories:
--allow-unrelated-histories
By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added.
For this, enter the command:
git pull origin branchname --allow-unrelated-histories
For example,
git pull origin master --allow-unrelated-histories
Reference:
I ran this command and the issue got resolved.
git pull origin branchName --allow-unrelated-histories
Check out this page for more information.
git merge origin/main localBranchName --allow-unrelated-histories work for me. –
Hexagon I had the same problem. Try this:
git pull origin master --allow-unrelated-histories
git push origin master
For Android Studio and IntelliJ:
First, commit everything and resolve any conflicts.
Then open the terminal from below of IDE and enter:
git pull origin master --allow-unrelated-histories
Now you can push.
Try git pull --rebase development
git pull --rebase=preserve --allow-unrelated-histories development –
Watermelon newOrigin branch rather than development) added the initial commit to the top of my local branch, effectively removing almost everything from it. I wanted the initial commit from the new remote to be at the bottom. –
Sykes Since all the other answers are not actually answering the question, here is a solution inspired by this answer on a related question.
So you get your error doing git rebase:
$ git rebase origin/development
fatal: refusing to merge unrelated histories
Error redoing merge 1234deadbeef1234deadbeef
This error doesn't actually cancel the rebase, but you are now in the middle of it:
$ git status
interactive rebase in progress; onto 4321beefdead
Last command done (1 command done):
pick 1234deadbeef1234deadbeef test merge commit
So you can now do the merge by hand. Find out the parent commits of the original merge commit:
$ git log -1 1234deadbeef1234deadbeef
commit 1234deadbeef1234deadbeef
Merge: 111111111 222222222
Author: Hans Dampf
Date: Wed Jun 6 18:04:35 2018 +0200
test merge commit
Find out which of the two merge parents is the one that was merged into the current one (probably the second one, verify with git log 222222222), and then do the merge by hand, copying the commit message of the original merge commit:
$ git merge --allow-unrelated 222222222 --no-commit
Automatic merge went well; stopped before committing as requested
$ git commit -C 1234deadbeef1234deadbeef
[detached HEAD 909af09ec] test merge commit
Date: Wed Jun 6 18:04:35 2018 +0200
$ git rebase --continue
Successfully rebased and updated refs/heads/test-branch.
This worked for me:
git push origin master --force
Firstly, pull the remote changes to your local using the following command:
git pull origin branchname --allow-unrelated-histories
** branchname is master in my case.
When the pull command is done, the conflict occurs. You should solve the conflicts. I use Android Studio to solve conflicts.
When the conflicts are solved, the merge is done!
Now you can safely push.
Resolve Conflict in AS. Sometimes the right-bottom popup/ballon disappear & I'm unable to do anything. Thanks @Athenian –
Asia I had the same problem. The problem is remote had something preventing this.
I first created a local repository. I added a LICENSE and README.md file to my local and committed.
Then I wanted a remote repository so I created one on GitHub. Here I made a mistake of checking "Initialize this repository with a README", which created a README.md in remote too.
So now when I ran
git push --set-upstream origin master
I got:
error: failed to push some refs to 'https://github.com/lokeshub/myTODs.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes
(e.g. hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Now to overcome this I did
git pull origin master
Which resulted in the below error:
From https://github.com/lokeshub/myTODs
branch master -> FETCH_HEAD
fatal: refusing to merge unrelated histories**
I tried:
git pull origin master --allow-unrelated-histories
Result:
From https://github.com/lokeshub/myTODs
* branch master -> FETCH_HEAD
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Automatic merge failed;
fix conflicts and then commit the result.
Solution:
I removed the remote repository and created a new (I think only removing file README could have worked) and after that the below worked:
git remote rm origin
git remote add origin https://github.com/lokeshub/myTODOs.git
git push --set-upstream origin master
git push --force ... would be a proper solution on step 1 in this particular case –
Eupatrid This usually happens when you commit first time to remote repository. As error clearly says "refusing to merge unrelated histories", we need to use --allow-unrelated-histories flag.
git pull origin master --allow-unrelated-histories
Now there would be some conflicts which we have to solve manually. After that just commit the code and push it.
--allow-unrelated-histories flag. –
Labored When doing a git pull, I got this message fatal: refusing to merge unrelated histories
for a repo module where I hadn't updated the local copy for a while.
I ran this command just to refresh local from origin. I just wanted latest from remote and didn't need any local changes.
git reset --hard origin/master
This fixed it in my case.
I tried git pull --allow-unrelated-histories, and it didn't work, but this solved the issue for me:
I copied all the files on my desktop repository to another folder and then deleted the folder.
Then I clone the repository again because it is a new project.
When I copied my files again and push it worked like charm.
I struggled with this as well, but I managed to find a workaround.
When you run into the error above, just cherry-pick the merge commit and then continue the rebase:
git cherry-pick -m 1 1234deadbeef1234deadbeef
git rebase --continue
If you created a new repository on GitHub and accidentally initialized it with README or .gitignore files.
If you found yourself unable to merge or rebase because .git folder got corrupted.
Then:
git cloneNow the local and remote will have "related histories" and will merge or rebase happily.
The error is resolved by toggling the allow-unrelated-histories switch. After a Git pull or Git merge command, add the following tag:
git pull origin master --allow-unrelated-histories
After then, maybe you will get a conflict. So resolve the conflict, and commit it. It worked for me.
For my case I wanted to merge an unrelated history branch to my current:
git merge <-unrelated-history-branch-name> --allow-unrelated-histories
I run into the same issue:
This is what I've done:
git pull origin main --allow-unrelated-histories
I used Visual Studio Code to resolve merge conflicts, and then I did:
git commit -m "commit message"
git push origin main
blue112's answer doesn't solve this question, which is in the context of rebasing.
The only way to synchronize the two diverged branches is to merge them back together, resulting in an extra merge commit and two sets of commits that contain the same changes (the original ones, and the ones from your rebased branch). Needless to say, this is a very confusing situation.
So, before you run git rebase, always ask yourself, “Is anyone else looking at this branch?” If the answer is yes, take your hands off the keyboard and start thinking about a non-destructive way to make your changes (e.g., the git revert command). Otherwise, you’re safe to re-write history as much as you like.
Reference: The Golden Rule of Rebasing
If someone is facing the same problem while rebase the branch after doing --allow-unrelated-histories also please use this git pull origin <branch-name> --allow-unrelated-histories --no-ff hope it may help someone
This also happens if you have a shallow Git clone of the repository.
I recently encountered this problem in my CI/CD setup, and none of the previous solutions worked for me. I was building a CI/CD pipeline to analyze code on MR creation against the MR source branch. For that, I needed to run an analysis on the main branch once and then on the MR source branch merged with main, and I got this error while trying to merge branches via the git merge command.
The reason for this happening in the CI/CD setup: Usually in a CI/CD environment, Git repositories are a shallow clone to speed up things, which doesn't include a full history of commits due to which, when merging Git, we may think that we are trying to merge unrelated branches which is in fact not true.
Solution:
Convert a shallow repository to an unshallow one using the following command:
git fetch --unshallow
actions/checkout@v3, you can specify the fetch depth: with: fetch-depth: 0 –
Khasi A pretty rare scenario I believe; You have removed the remote (e.g. origin):
git remote rm origin
Then, after a while, for some reason, you tried to add it back but entered the wrong URL.
git remote add origin [email protected]:example/wrong.git
The solution of course is to use the right URL:
git remote add origin [email protected]:example/correct.git
git remote -v (or: git remote --verbose) also check any branch tracking info with git config -l (or: git config --list) in eg branch.main.remote=origin -see also the values for remote.origin.url remote._name_.url –
Khasi I am using the rebase for years and I had never encountered such a problem. However, your first problem is, that you try to do it directly on the remote branch development from the remote repository, called origin. That is literally wrong because rebase is a dangerous command, that restructures the git history. Having said that, you should first try on your local repository and pushing it only, if it works for you as expected.
So, my usual rebase workflow looks like following (but please keep in mind, that you should not use rebase on branches, which you are not the only one committee. For such branches, use simply merge and resolve conflicts, if applicable):
master; as a one-line command): git checkout master && git pull origin master && git checkout developmentgit rebase mastergit push -f origin developmentAs I already mentioned, keep in mind, that rebase manipulates the git history, that is usually a bad thing. However, it's possible to do that on branches, where no one else commits to. In order to keep the branch pull-able for the other developers, use another merge strategy like merge itself, squash or cherrypick. So, in other words: Rebase shouldn't be your tool on distributed development. It works fine for you if you are the only one who works on this repository.
We use the feature branch strategy. In this, I usually use rebase in order to get the "updates" from the other developers, that happened in the meantime on the master branch. Doing so, it reduces the size of commits that are visible in a pull request. Therefore, it makes it easier for the code reviewer to see my changes made in this feature branch.
I faced this error after force-pushing to origin/master a development branch with a few hundreds of commits, by the Administrator, on the server side.
Well, I just didn't wanted to pull (fetch+merge), but just to align my local master to the remote origin master. Moving to a separate folder and doing a Git clone is one approach, but I believe it is more elegant solution just to do a hard reset.
So my answer to this error, in this particular case, is none of the above.
I just wanted this:
git reset --hard origin/master
for me was moving all content to another folder then i did git pull then i moved files back then git add and then git commit -m "messag" then git push
fatal: refusing to merge unrelated histories may also be caused by a shallow clone, because the graft commit doesn't go far enough down to see the common base.
I had the same error, and this command worked for me:
git pull gitlab master --allow-unrelated-histories
Note that gitlab might be origin or heroku in your case.
git remote -v –
Khasi Since you're neither able to push nor pull-and-push nor merge-pull-and-push:
git add .git commit -m 'commitName'git branch -m master branchNamegit push -f origin branchNameThis worked for me.
I had a situation where a repo was created for me with a single commit (containing only with README.md). I had "starter code" in another repo to merge.
In the end, this is what worked for me:
# clone target repo (that we want to merge into)
git clone <REPO1>
cd REPO1
# add remote for repo to merge
git remote add repo2 <REPO2>
git fetch repo2
git checkout repo2/branch_to_merge
# we are in "detached head" state
git switch -c branch_temp
git checkout main
git merge branch_temp --allow-unrelated-histories
# address conflicts
git add .
git commit -m "fixed conflict with initial commit"
git push
Hope this is helpful to someone.
© 2022 - 2024 — McMap. All rights reserved.
git-rebasesituation while the answer gives a flag forgit-merge– Laboredgit pull [repo URL]instead ofgit clone [repo URL]– Etamine