如何解决error: failed to push some refs to 'xxx(远程库)'

如何解决error: failed to push some refs to ‘xxx(远程库)’

在使用 Android Studio 对源代码进行push到码云时可出错，报错如下:

15:55:01.129: [fuwandai] git -c core.quotepath=false push --progress --porcelain origin refs/heads/master:master --set-upstream
error: failed to push some refs to 'https://gitee.com/dapanjimianpaigumian/FirstProject.git'
To https://gitee.com/dapanjimianpaigumian/FirstProject.git
!	refs/heads/master:refs/heads/master	[rejected] (fetch first)
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
Done
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.

  

 

  
1
  
2
  
3
  
4
  
5
  
6
  
7
  
8
  
9
  
10
  
11
 

出现错误的主要原因是oschina中的README.md文件不在本地代码目录中

可以通过如下命令进行代码合并【注：pull=fetch+merge]

git pull --rebase origin master

执行上面代码后可以看到本地代码库中多了README.md文件

此时再执行语句 git push -u origin master即可完成代码上传到oschina

————————————————

原文链接：https://blog.csdn.net/zhao_xin_peng/article/details/79378895

文章来源: hiszm.blog.csdn.net，作者：孙中明，版权归原作者所有，如需转载，请联系作者。

原文链接：hiszm.blog.csdn.net/article/details/104043055