本地代码上传GitHub出错解决
2017-11-10 11:26
363 查看
在GitHub上创建repository时初始化.gitignore和readme.md,在本地push出现冲突
$ git push origin master
To https://github.com/*******/shopping.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/*******/shopping.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.
解决方法:
1、使用强制push的方法:
$git push -u origin master -f(不建议该种解决办法,因为这会使远程库资料丢失,尤其在多人协作开发时更不可取)
2、push前先将远程repository修改pull下来
$ git pull origin master
$ git push -u origin master
3、若不想merge远程和本地修改,可以先创建新的分支:
$ git branch [name]
然后push
$ git push -u origin [name]
$ git push origin master
To https://github.com/*******/shopping.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/*******/shopping.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.
解决方法:
1、使用强制push的方法:
$git push -u origin master -f(不建议该种解决办法,因为这会使远程库资料丢失,尤其在多人协作开发时更不可取)
2、push前先将远程repository修改pull下来
$ git pull origin master
$ git push -u origin master
3、若不想merge远程和本地修改,可以先创建新的分支:
$ git branch [name]
然后push
$ git push -u origin [name]
相关文章推荐
- 解决网站项目本地运行ok,将代码上传到服务器中或github中无CSS效果
- 教你上传本地代码到github(内含报错解决方法)
- 将本地代码上传到github走过的坑
- GitHub上传本地项目代码
- github上传、git不存在git init选项、本地更新到远程的解决办法
- 上传本地代码到github
- 如何上传本地代码到github上
- 【Windows Git】gitbash将本地代码上传到github
- 上传本地代码到github
- 上传本地项目代码到github
- 将本地代码上传到github
- Mac 本地代码上传GitHub
- 上传本地代码建立 github 版本库
- 上传本地代码到github
- 使用终端命令行将本地项目上传到Github并提交代码
- 本地代码上传到github
- github上传本地代码失败
- 本地代码上传 -> Github
- push本地代码到github出错
- MacOS使用命令行上传本地代码包到Github方法