Open huoxiangdong opened 6 years ago
# fatal: refusing to merge unrelated histories
git pull origin master --allow-unrelated-histories
# error: failed to push some refs to
git pull origin master
git push -u origin master
#Found a swap file by the name ".git/.MERGE_MSG.swp”"
找到.git/.MERGE_MSG.swp这个文件删除即可
更换仓库
git remote remove origin
git remote add origin [new_remote_repository_address]
git push origin master