GitHub 上传代码错误处理 [rejected] master -> master (fetch first)(non-fast forward)

GitHub 上传代码错误处理

目录

首先让我们复习一下，往GitHub上面上传代码的方法：

…or create a new repository on the command line
echo “# TEST” >> README.md
git init
git add README.md
git commit -m “first commit”
git remote add origin https://github.com/binbinErices/TEST.git
git push -u origin master

---

详细方法请参考博客：https://blog.csdn.net/erice_s/article/details/79931764

最近我在实践中出现了一些错误：

1.fatal: refusing to merge unrelated histories

$ git pull https://github.com/binbinErices/Super026_Algo.git
From https://github.com/binbinErices/Super026_Algo
* branch HEAD -> FETCH_HEAD
fatal: refusing to merge unrelated histories

2. ! [rejected] master -> master (non-fast-forward)

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

3.错误原因

我在Github新建一个仓库，写了License，然后把本地以前写的一个仓库上传。
先pull，因为两个仓库不同，发现refusing to merge unrelated histories，无法pull。后面git push -u origin master，同样会出现 ! [rejected] master -> master (non-fast-forward)。

4.解决方案 git pull origin master –allow-unrelated-histories

因为他们是两个不同的项目，需要把两个不同的项目合并，假如我们的源是origin，分支是master，那么我们需要这样写：
git pull origin master –allow-unrelated-histories

5.上传成功