在Terminal顺序输入
1. git pull origin master --allow-unrelated-histories2.git pull origin master3.git init4.git add .5.git commit -m 'testst'6.git push -u origin master
即可解决