解决 gitpush时错误 error: failed to push some refs to

今天药忘吃喽~ 2023-02-24 11:21 103阅读 0赞

精选30+云产品，助力企业轻松上云！>>> hot3.png

错误信息

push时出错

  1. $ git push origin master
  2. To https://gitee.com/xindongwl/knowledge-pay-app.git
  3.  ! [rejected]        master -> master (non-fast-forward)
  4. error: failed to push some refs to 'https://gitee.com/xindongwl/knowledge-pay-app.git'
  5. hint: Updates were rejected because the tip of your current branch is behind
  6. hint: its remote counterpart. Integrate the remote changes (e.g.
  7. hint: 'git pull ...') before pushing again.
  8. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

pull时出错

  1. $ git pull origin master
  2. remote: Enumerating objects: 303, done.
  3. remote: Counting objects: 100% (303/303), done.
  4. remote: Compressing objects: 100% (171/171), done.
  5. remote: Total 303 (delta 102), reused 299 (delta 101), pack-reused 0
  6. Receiving objects: 100% (303/303), 1.32 MiB | 738.00 KiB/s, done.
  7. Resolving deltas: 100% (102/102), done.
  8. From https://gitee.com/xindongwl/knowledge-pay-app
  9.  * branch            master     -> FETCH_HEAD
  10.  * [new branch]      master     -> origin/master
  11. error: The following untracked working tree files would be overwritten by merge:
  12.         App.vue
  13.         README.md
  14.         common/common.js
  15.         unpackage/dist/dev/.tmp/app-plus/pageforum/forum/edit.js
  16.         .....(注:这还有一堆文件,就不复制了)
  17.         unpa
  18. Aborting

解决

先执行该命令：git pull origin master —allow-unrelated-histories

  1. git pull origin master --allow-unrelated-histories  意思是将两个没有关系的分支,强行合并。出现冲突再解决冲突即可

执行之后再push即可：git push origin master

就这样

发表评论

表情：
评论列表 （有 0 条评论，103人围观）

还没有评论，来说两句吧...

相关阅读