git pull origin master –allow-unrelated-histories git push -u origin master -f
原地址 https://www.jianshu.com/p/f8c9fb05681b