git 解决push报错：[rejected] master -＞ master (fetch first) error: failed to push some refs to

git 解决push报错：[rejected] master -> master (fetch first) error: failed to push some refs to

        </h1><div class="clear"></div><div class="postBody cye-lm-tag">

今天对代码进行了修改优化，然后往往远程push，但push后报错了

1|0git操作

git add . git commit -m"fix" git push origin master:dev-gaochao

2|0报错信息

To https://amc-msra.visualstudio.com/trading-algo/_git/real-trading! [rejected] master -> dev-gaochao (fetch first) error: failed to push some refs to 'https://amc-msra.visualstudio.com/trading-algo/_git/real-trading' 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.

3|0原因

之所以出现这个原因，是因为我在线上生成、编辑了README.md文件，而本地代码文件中不包含它，所以线上线下就对不上了。

4|0解决

将线上、线下代码进行合并

git pull --rebase origin dev-gaochao

然后再进行push

git push origin master:dev-gaochao

成功：

Enumerating objects: 11, done. Counting objects: 100% (11/11), done. Delta compression using up to 4 threads Compressing objects: 100% (7/7), done. Writing objects: 100% (7/7), 1.90 KiB | 487.00 KiB/s, done. Total 7 (delta 4), reused 0 (delta 0) remote: Analyzing objects... (7/7) (13 ms) remote: Checking for credentials and other secrets... (1/1) done (1008 ms) remote: Storing packfile... done (157 ms) remote: Storing index... done (87 ms) To https://amc-msra.visualstudio.com/trading-algo/_git/real-trading1919525..6f3asa4dd6 master -> dev-gaochao

__EOF__

本文作者：BigTree
本文链接：https://www.cnblogs.com/bigtreei/p/10180383.html
关于博主：评论和私信会在第一时间回复。或者直接私信我。
版权声明：本博客所有文章除特别声明外，均采用 BY-NC-SA 许可协议。转载请注明出处！
声援博主：如果您觉得文章对您有帮助，可以点击文章右下角【推荐】一下。您的鼓励是博主的最大动力！

分类: git