git push 时出现hint错误

来源:互联网 发布:网络剧的受众分析 编辑:程序博客网 时间:2024/06/05 18:41

git pull下代码后,出现了几处冲突,合并完冲突发现push不上去,错误提示如下:

$ git push origin master

.........

error: failed to push some refs to 'git@github.com---------.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

就是这个样子,git status查看状态,还是提示需要push,不过看着错误的大概意思是在你提交的过程中有其他人也提交了代码,你这边的已经不是最新的了,所以重新git pull就可以了,问题解决。

0 0