当使用commmit命令提交出现错误
! [rejected] master -> master (fetch first)
error: failed to push some refs to ‘https://gitee.com/dashuaibicx/livegoods.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.
或者push出现错误提示
To https://gitee.com/dashuaibicx/livegoods.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to ‘https://gitee.com/dashuaibicx/livegoods.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.
原因:项目pull下来本地后,项目被别的coder push了新内容而你没有及时pull下来,当你提交时git上的代码和你最后一次pull下来的代码不一致,导致冲突。
解决1:使用命令 git pull --rebase origin master 将github修改的文件更新到本地
git pull --rebase origin master
再使用 git push命令
解决2:
1、git pull origin master --allow-unrelated-histories //把远程仓库和本地同步,消除差异
2、重新add和commit相应文件
3、git push origin master
4、此时就能够上传成功了
二:使用pull产生conflict
解决方法:
1.git pull会产生merge操作导致冲突,需要将冲突的文件resolve掉之后才能成功pull,既区产生冲突的的文件删除
测试—————————————————————————————
将<<<<HEAD,=====,和>>>>c5… 所在行删除 及冲突行的某一个行删除/修改
结果**************************************