I\'m learning git, and I\'m following the Git community book.
Previously (long time ago) I made a public repository on Github, with some files. Now I set up a local
Try --allow-unrelated-histories
Like max630 commented, or as explained here Git refusing to merge unrelated histories
Execute the following command:
git pull origin master --allow-unrelated-histories
A merge vim will open. Add some merging message and:
And you are good to go.