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

git操作

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

回到顶部

报错信息

git push后出现错误 ![rejected] master -> master(non-fast-forward) error:failed to push some refs to XXX

git push后出现错误 ![rejected] master -> master(non-fast-forward) error:failed to push some refs to XXX

本地创建了一个project
并在GitHub上创建了一个仓库，想要将本地的仓库链接到远程仓库
我用的是如下方法：
git init    初始化本地仓库
git remote add origin XXX     添加远程仓库地址
如果你在这之后就执行
git add -A，
git commit -m " "
git push origin master,那么就会出现这个问题(被拒绝)，所以在remote add后不要着急git add，一定要git pull origin master，出现这个原因
是因为你在码云创建的仓库有ReadMe文件，而本地没有，造成本地和远程的不同步，
那么有两种方案可以解决：
one ：
本地没有ReadMe文件，那么就在本地生成一个：

git pull --rebase origin master     本地生成ReadMe文件
git push origin master

two：
那我就强制上传覆盖远程文件，
git push -f origin master

 

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.

回到顶部

原因

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

回到顶部

解决

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

git pull --rebase origin dev-ga

然后再进行push

git push origin master:dev-ga

成功：

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-trading
   1919525..6f3asa4dd6  master -> dev-g