解决:
git pull origin master --allow-unrelated-histories
git branch --track master origin/master
或
git branch --set-upstream-to master origin/master
解决:
git pull origin master --allow-unrelated-histories
git branch --track master origin/master
或
git branch --set-upstream-to master origin/master