fatal: refusing to merge unrelated histories after adding git remote

Question

I've added a remote repository to the folder where I am working with :

git remote add origin https://github.com/<username>/<repo>.git

If I type:

git pull origin master

I get:

From https://github.com/<username>/<repo>
    * branch            master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

I have also tried:

$ git pull origin master --allow-unrelated-histories

But I get:

From https://github.com/...
    * branch            master     -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
    <files>
Please commit your changes or stash them before you merge.
Aborting

About the second error: stackoverflow.com/questions/35450049/… — max630
technically yes because it didn't find the repository that I was working . SO i typed this : ``` git remote add origin github.co/username/xxxxx.git ``` — ramab01
Possible duplicate of What does "would be overwritten by merge" mean? — phd
git pull origin master --allow-unrelated-histories .See here stackoverflow.com/questions/37937984/… — Bhargav Variya

Fernando Espinosa Fernando Espinosa · Accepted Answer · 2018-05-01T04:32:35

You need to either reset or commit your changes first:

git reset --hard

or:

git commit -m "saving changes..."

Then you can do:

git pull origin master --allow-unrelated-histories

fatal: refusing to merge unrelated histories after adding git remote

1 Answers