git pull
git pull origin master
git pull origin master --allow-unrelated-histories
如果还是提交不了可以试试下面这行代码
git push -u origin master -f
git pull
git pull origin master
git pull origin master --allow-unrelated-histories
如果还是提交不了可以试试下面这行代码
git push -u origin master -f