报错信息如下:
error: failed to push some refs to 'git@github.com:zzzz/zzzz.git'
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.
出现报错的原因是:码云中的README.md文件不在本地代码目录中。导致本地版本库里的文件和远程仓库里的文件出现冲突。
解决办法:
1:取回远程仓库的某分支的更新,然后与本地的指定分支合并,解决冲突
git pull --rebase origin master
现在就可以git push了。
2:强制提交到远程仓库,但是会导致远程仓库里的readme.md文件丢失
git push -u origin master -f