git pull origin branchname --allow-unrelated-histories
git merge upstream/master --allow-unrelated-histories