
执行以下步骤:
git pull
git pull origin master
git pull origin master --allow-unrelated-histories
git push --set-upstream origin master
执行以下步骤:
git pull
git pull origin master
git pull origin master --allow-unrelated-histories
git push --set-upstream origin master