在提交之前執(zhí)行下面三條命令:
git pull
git pull origin master
git pull origin master --allow-unrelated-histories
之后提交代碼:
git push -u origin master
在提交之前執(zhí)行下面三條命令:
git pull
git pull origin master
git pull origin master --allow-unrelated-histories
之后提交代碼:
git push -u origin master