1. 拒绝合并无关历史
fatal: refusing to merge unrelated histories
解决办法：
git pull origin master --allow-unrelated-histories