问题描述
今天用git提交项目到gitee上时,执行下面语句时报错
git push -u origin master
error: failed to push some refs to ‘xxxxx’
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: ‘git pull …’) before pushing again.
hint: See the ‘Note about fast-forwards’ in ‘git push --help’ for details.
意思是:自己当前版本低于远程仓库版本
解决方案
于是去百度,找到如下解决办法
使用强制push的方法:
git push -u origin master -f //但这样会使远程修改丢失。
push前先将远程repository修改pull下来
git pull origin master
git push -u origin master
结果又报refusing to merge unrelated histories这个错,我······
解决方案
执行
git pull origin master --allow-unrelated-histories
执行这一步时可能会让你输入合并理由啥的,直接叉掉就好了。
将远程仓库的文件拉取到本地仓库了。紧接着将本地仓库的提交推送到远程github仓库上,使用的命令是:
git push origin master:master
终于成功解决问题。