Trying to pull files from my Github repository: “refusing to merge unrelated histories”

Question

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

Answer 1

git checkout master
git merge origin/master --allow-unrelated-histories

Resolve conflict, then

git add -A .
git commit -m "Upload"
git push