解决办法:进入项目所在目录,右键git bash here运行以下命令:
git pull origin master –allow-unrelated-histories git push -u origin master -f