码云git提交代码报错:error: failed to push some refs to 'https://gitee.com/houtizong/dockers.git'
技术  /  管理员 发布于 2年前   1827
在git bash here上push代码报以下错误:error: failed to push some refs to...
上图我执行命令步骤的信息也复制一份:
htz@DESKTOP-1O1O87R MINGW64 ~/dockers (master)
$ git add .
warning: in the working copy of 'nginx/logs/access.log', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'nginx/logs/error.log', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'php/conf/php.ini', LF will be replaced by CRLF the next time Git touches it
htz@DESKTOP-1O1O87R MINGW64 ~/dockers (master)
$ git commit -m '在php74容器中安装composer管理工具'
[master 3f5c512] 在php74容器中安装composer管理工具
4 files changed, 138 insertions(+), 2 deletions(-)
htz@DESKTOP-1O1O87R MINGW64 ~/dockers (master)
$ git push origin master
To https://gitee.com/houtizong/dockers.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://gitee.com/houtizong/dockers.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.
ps:
一般的出现这种情况,就是远程仓库跟本地仓库不一样导致
本仓库是我私人仓库就是我一个人用,加上我又忘记我改了什么东西,
所以我直接强制合并了:
git pull origin master --allow-unrelated-histories
htz@DESKTOP-1O1O87R MINGW64 ~/dockers (master)
$ git pull origin master --allow-unrelated-histories
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 1024 bytes | 42.00 KiB/s, done.
From https://gitee.com/houtizong/dockers
* branch master -> FETCH_HEAD
438e01c..ce5ac3b master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
README.md
Please commit your changes or stash them before you merge.
Aborting
上面的意思是:
您对以下文件的本地更改将被合并覆盖:README.md,
请在合并之前提交您的更改或存储它们
后面我又本地提交一次:
htz@DESKTOP-1O1O87R MINGW64 ~/dockers (master)
$ git add .
htz@DESKTOP-1O1O87R MINGW64 ~/dockers (master)
$ git commit -m '在php74容器中安装composer管理工具'
[master 5a17f43] 在php74容器中安装composer管理工具
1 file changed, 9 insertions(+), 9 deletions(-)
htz@DESKTOP-1O1O87R MINGW64 ~/dockers (master)
$ git push origin master
To https://gitee.com/houtizong/dockers.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://gitee.com/houtizong/dockers.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.
还是不行!!!
所以我直接使用一下命令进行合并
git pull --rebase origin master
htz@DESKTOP-1O1O87R MINGW64 ~/dockers (master)
$ git pull --rebase origin master
From https://gitee.com/houtizong/dockers
* branch master -> FETCH_HEAD
warning: skipped previously applied commit 5a17f43
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Successfully rebased and updated refs/heads/master.
重新提交就可以了
htz@DESKTOP-1O1O87R MINGW64 ~/dockers (master)
$ git push -u origin master
Enumerating objects: 19, done.
Counting objects: 100% (19/19), done.
Delta compression using up to 16 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (10/10), 1.99 KiB | 510.00 KiB/s, done.
Total 10 (delta 4), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.4]
To https://gitee.com/houtizong/dockers.git
ce5ac3b..b9ffee5 master -> master
branch 'master' set up to track 'origin/master'.
122 在
学历:一种延缓就业设计,生活需求下的权衡之选中评论 工作几年后,报名考研了,到现在还没认真学习备考,迷茫中。作为一名北漂互联网打工人..123 在
Clash for Windows作者删库跑路了,github已404中评论 按理说只要你在国内,所有的流量进出都在监控范围内,不管你怎么隐藏也没用,想搞你分..原梓番博客 在
在Laravel框架中使用模型Model分表最简单的方法中评论 好久好久都没看友情链接申请了,今天刚看,已经添加。..博主 在
佛跳墙vpn软件不会用?上不了网?佛跳墙vpn常见问题以及解决办法中评论 @1111老铁这个不行了,可以看看近期评论的其他文章..1111 在
佛跳墙vpn软件不会用?上不了网?佛跳墙vpn常见问题以及解决办法中评论 网站不能打开,博主百忙中能否发个APP下载链接,佛跳墙或极光..
Copyright·© 2019 侯体宗版权所有·
粤ICP备20027696号