- Published on
Git refusing to merge unrelated histories on rebase
- Authors
- Name
- Milad E. Fahmy
- @miladezzat12
Git refusing to merge unrelated histories on rebase
During git rebase origin/development the following error message is shown from Git
fatal: refusing to merge unrelated histories
Error redoing merge 1234deadbeef1234deadbeef
git mergeused 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.
You can use --allow-unrelated-histories to force the merge to happen.
git pull origin <BRANCH_NAME> --allow-unrelated-histories