git pull origin master --allow-unrelated-histories git rebase //search for this if the other one doesn't work, only the second line did it for me