git踩坑_git pull failed post git-upload-pack

新项目 origin有readme文件本地没有导致报错

pull 报错

在传远端之前，pull远端代码报错

具体报错

11:06	Git Pull Failed
			POST git-upload-pack (225 bytes)
			warning: no common commits
			remote: Enumerating objects: 3, done.
			remote: Total 3 (delta 0), reused 0 (delta 0)
			From https://git.finchina.com/hf-develop/middle/micro-service/finchina-finance
			* branch            dev        -> FETCH_HEAD
			* [new branch]      dev        -> origin/dev
			refusing to merge unrelated histories
1
2
3
4
5
6
7
8
9

解决方法

git checkout master #切换到要提交代码的分支
git pull origin master --allow-unrelated-histories ## 加上后面这个选项允许不相关历史提交
## 执行上一步之后出现readme文件
## 之后需要commit readme文件
1
2
3
4
5