I have a set of code which worked on before but never version controlled. I was trying to push it to Github by creating a new repo on Github with some git ignore config files and README.md, then initialize, add and commit the local repo with:
git add .
git commt -m "some message"
However when I try to pull from the remote repo on Github, an error was raised:
fatal: refusing to merge unrelated histories
And then I realized, since git 2.9, the default behaviour of merging two unrelated repo has been changed:
“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.
To work around this, I took the suggestion and used the flag:
in my command:
git pull --allow-unrelated-histories origin master
And the issue was resolved and the remote and local worked were merged fine, so I was able to push my local code to Github.