如何解决failed to push some refs to git
在使用git 对源代码进行push到gitHub时可能会出错,信息如下
$git push -u origin master -f
Password authentication
Password:
Enumerating objects: 114, done.
Counting objects: 100% (114/114), done.
Delta compression using up to 8 threads
Compressing objects: 100% (105/105), done.
Writing objects: 100% (114/114), 82.48 KiB | 2.43 MiB/s, done.
Total 114 (delta 18), reused 0 (delta 0)
remote: Resolving deltas: 100% (18/18)
To ssh://172.18.1.165:29418/thbic/cei_backend.git
! [remote rejected] master -> master (non-fast forward)
error: failed to push some refs to 'ssh://sunpw@172.18.1.165:29418/thbic/cei_backend.git'
此时很多人会尝试下面的命令把当前分支代码上传到master分支上,但依然没能解决问题。出现错误的主要原因是github中的README.md文件不在本地代码目录中
可以通过如下命令进行代码合并【注:pull=fetch+merge]
git pull --rebase origin master
执行上面代码后可以看到本地代码库中多了README.md文件
git 切换远程仓库
1、切换远程仓库地址:
方式一:修改远程仓库地址
git remote set-url origin Url 更换远程仓库地址,Url为新地址。
方式二:先删除远程仓库地址,然后再添加
git remote rm origin 删除现有远程仓库
git remote add origin url 添加新远程仓库
2、git remote -v 查看远程仓库的地址
admin@DESKTOP-OBF12UT MINGW64 ~/Desktop/建筑信息平台/DjangoScrapy - inall (master)
$ git remote -v
origin Https://git@gihub.com:peiwang245/Scrapy-Django-mysql.git (fetch)
origin Https://git@gihub.com:peiwang245/Scrapy-Django-mysql.git (push)
$ git remote rm origin
$ git remote add origin https://git@github.com:peiwang245/Scrapy-Django-mysql
$ git remote -v
origin https://git@github.com:peiwang245/Scrapy-Django-mysql (fetch)
origin https://git@github.com:peiwang245/Scrapy-Django-mysql (push)
git status -s 状态简览