I ended in the same situation after a series of mishapps. Have a look at this thread : I just did a  git pull --allow-unrelated-histories and it was fixed! ... View more