学习笔记:关于git错误error: failed to push some refs to‘...’

在学习git过程中,Windows上测试push过程中我出现了以下问题:

$ git push -u rs485 master
To https://github.com/@@@@@/mm32f003_rs485.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to ‘https://github.com/@@@@@/mm32f003_rs485.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.

这个时候我已经在GitHub上建立并关联了远程库rs485
查阅资料后发现:

因为远程库中已经存在README.md文件,就pull下来。

$ rm README.md
//我先把本地的README.md删除,再pull

$ git pull rs485 master
From https://github.com/@@@@@/mm32f003_rs485

  • branch master -> FETCH_HEAD
    fatal: refusing to merge unrelated histories

又有问题:fatal: refusing to merge unrelated histories拒绝合并无关的历史
可以加上参数 --allow-unrelated-histories 解决问题

$ git pull rs485 master --allow-unrelated-histories
From https://github.com/@@@@@/mm32f003_rs485

  • branch master -> FETCH_HEAD
    Merge made by the ‘recursive’ strategy.
    README.md | 2 ++
    1 file changed, 2 insertions(+)
    create mode 100644 README.md

完了之后会默认进入vim编辑器,输入提交信息保存退出就好了。
之后再试试

$ git push -u rs485 master
Enumerating objects: 915, done.
Counting objects: 100% (915/915), done.
Delta compression using up to 4 threads
Compressing objects: 100% (854/854), done.
Writing objects: 100% (914/914), 4.89 MiB | 667.00 KiB/s, done.
Total 914 (delta 576), reused 0 (delta 0)
remote: Resolving deltas: 100% (576/576), done.
To https://github.com/@@@@@/mm32f003_rs485.git
dba1e2f…df2a319 master -> master
Branch ‘master’ set up to track remote branch ‘master’ from ‘rs485’.

再来看看GitHub上,本来是空仓,现在成功推送了!
学习笔记:关于git错误error: failed to push some refs to‘...’_第1张图片
大成功!!!

为此感谢@新e风艺术工作室
问题解决出处:芥凯儿(链接)
https://www.liaoxuefeng.com/discuss/969956160874304/1277343677018304

你可能感兴趣的:(学习笔记:关于git错误error: failed to push some refs to‘...’)