在提交之前执行下面三条命令:
git pull
git pull origin master
git pull origin master --allow-unrelated-histories
之后提交代码:
git push -u origin master
在提交之前执行下面三条命令:
git pull
git pull origin master
git pull origin master --allow-unrelated-histories
之后提交代码:
git push -u origin master