当发现本地仓库向远程仓库推送出现如下错误时的解决办法:(一般是2边的信息不同步)
“
xxxh@w-ThinkCentre-E76a-12:~/special_pro_code/xxx_lite_ap76_k5_01$ git push upstream master
...
To https://xxxx.xxxx.com.cn/xxx10/xxx_lite_ap_01.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to ' https://xxxx.xxxx.com.cn/xxx10/xxx_lite_ap_01.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 pull --rebase upstream master 这样要推送的远程仓库内容和本地仓库一致,不会再报如上错误。注意此处不是写成网上常见的方法"git pull --rebase origin master",是因为我们的upstream远程仓库与本地仓库不是一个链接。