侯体宗的博客
  • 首页
  • Hyperf版
  • beego仿版
  • 人生(杂谈)
  • 技术
  • 关于我
  • 更多分类
    • 文件下载
    • 文字修仙
    • 群聊
    • 九宫格抽奖
    • 拼图
    • 消消乐
    • 相册

码云git提交代码报错:error: failed to push some refs to 'https://gitee.com/houtizong/dockers.git'

技术  /  管理员 发布于 6个月前   720

在git bash here上push代码报以下错误:error: failed to push some refs to...

gitee提交.png

上图我执行命令步骤的信息也复制一份:

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'.

1.png


  • 上一条:
    thinkphp6框架中封装redis操作类
    下一条:
    Laravel的邮件SPF检查器扩展包:Laravel Mail SPF Checker
  • 昵称:

    邮箱:

    0条评论 (评论内容有缓存机制,请悉知!)
    最新最热
    • 分类目录
    • 人生(杂谈)
    • 技术
    • linux
    • Java
    • php
    • 框架(架构)
    • 前端
    • ThinkPHP
    • 数据库
    • 微信(小程序)
    • Laravel
    • Redis
    • Docker
    • Go
    • swoole
    • Windows
    • Python
    • 苹果(mac/ios)
    • 相关文章
    • 性能测试工具、HTTP基准测试工具:wrk(0个评论)
    • namesilo域名+香港服务器+acme.sh给网站生成免费ssl证书流程步骤(0个评论)
    • 控制反转IOC设计模式简单的示例代码(0个评论)
    • 来自京东开发者的接口优化的常见方案实战总结(0个评论)
    • 最新访问谷歌Google镜像/学术/搜索_GitHub镜像/下载加速链接2023/2/16持续更新(0个评论)
    • 近期文章
    • 在go语言中使用GoPDF包把html生成PDF文件示例(0个评论)
    • 在go语言中创建和解析(读取)符号链接示例(0个评论)
    • ubuntu 22.04系统中报错:Python 3.6 is no longer supported by the Python core team...解决方式(0个评论)
    • Laravel 10.4版本发布(0个评论)
    • mysql5.7中实现分区表及分区where in查询示例及分区分表对比浅析(0个评论)
    • nginx + vue配置实现同域名下不同路径访问不同项目(0个评论)
    • 在laravel框架中的5个HTTP客户端技巧分享(0个评论)
    • 在go语言中使用FFmpeg库实现PCM音频文件编码为mp3格式文件流程步骤(0个评论)
    • gopacket免安装Pcap实现驱动层流量抓包流程步骤(0个评论)
    • 在laravel项目中实现密码强度验证功能推荐扩展包:password-strength(0个评论)
    • 近期评论
    • 博主 在

      2023年国务院办公厅春节放假通知:1月21日起休7天中评论 @ xiaoB 你只管努力,剩下的叫给天意;天若有情天亦老,..
    • xiaoB 在

      2023年国务院办公厅春节放假通知:1月21日起休7天中评论 会不会春节放假后又阳一次?..
    • BUG4 在

      你翻墙过吗?国内使用vpn翻墙可能会被网警抓,你需了解的事中评论 不是吧?..
    • 博主 在

      go语言+beego框架中获取get,post请求的所有参数中评论 @ t1  直接在router.go文件中配就ok..
    • Jade 在

      如何在MySQL查询中获得当月记录中评论 Dear zongscan.com team, We can skyroc..
    • 2016-10
    • 2016-11
    • 2017-07
    • 2017-08
    • 2017-09
    • 2018-01
    • 2018-07
    • 2018-08
    • 2018-09
    • 2018-12
    • 2019-01
    • 2019-02
    • 2019-03
    • 2019-04
    • 2019-05
    • 2019-06
    • 2019-07
    • 2019-08
    • 2019-09
    • 2019-10
    • 2019-11
    • 2019-12
    • 2020-01
    • 2020-03
    • 2020-04
    • 2020-05
    • 2020-06
    • 2020-07
    • 2020-08
    • 2020-09
    • 2020-10
    • 2020-11
    • 2021-04
    • 2021-05
    • 2021-06
    • 2021-07
    • 2021-08
    • 2021-09
    • 2021-10
    • 2021-12
    • 2022-01
    • 2022-02
    • 2022-03
    • 2022-04
    • 2022-05
    • 2022-06
    • 2022-07
    • 2022-08
    • 2022-09
    • 2022-10
    • 2022-11
    • 2022-12
    • 2023-01
    • 2023-02
    • 2023-03
    Top

    Copyright·© 2019 侯体宗版权所有· 粤ICP备20027696号 PHP交流群

    侯体宗的博客