! [rejected] master -> master (non-fast-forward)(有推荐视频)
来源:互联网 发布:内地搞笑网络剧排行榜 编辑:程序博客网 时间:2024/06/06 03:58
当我们向github做push的时候经常会被rejected,解决方法有pull和rebase两种,这一集里我们讨论一下这两种方式的异同。
推荐视频:http://happycasts.net/episodes/10?autoplay=true
当要push代码到git时,出现提示:
error:failed to push some refs to ...
Dealing with “non-fast-forward” errors
From time to time you may encounter this error while pushing:
- $ git push origin master
- To ../remote/
- ! [rejected] master -> master (non-fast forward)
- error: failed to push some refs to '../remote/'
Merge the remote changes before pushing again. See the 'non-fast forward'
section of 'git push --help' for details.
This error can be a bit overwhelming at first, do not fear. Simply put, git cannot make the change on the remote without losing commits, so it refuses the push. Usually this is caused by another user pushing to the same branch. You can remedy this by fetching and merging the remote branch, or using pull to perform both at once.
In other cases this error is a result of destructive changes made locally by using commands like git commit --amend or git rebase. While you can override the remote by adding --force to the push command, you should only do so if you are absolutely certain this is what you want to do. Force-pushes can cause issues for other users that have fetched the remote branch, and is considered bad practice. When in doubt, don’t force-push.
问题(Non-fast-forward)的出现原因在于:git仓库中已经有一部分代码,所以它不允许你直接把你的代码覆盖上去。于是你有2个选择方式:
1,强推,即利用强覆盖方式用你本地的代码替代git仓库内的内容
git push -f
2,先把git的东西fetch到你本地然后merge后再push
$ git fetch
$ git merge
这2句命令等价于- $ git pull
可是,这时候又出现了如下的问题:
[branch "master"]
remote = origin
merge = refs/heads/master
这等于告诉git2件事:1,当你处于master branch, 默认的remote就是origin。
2,当你在master branch上使用git pull时,没有指定remote和branch,那么git就会采用默认的remote(也就是origin)来merge在master branch上所有的改变如果不想或者不会编辑config文件的话,可以在bush上输入如下命令行:
- $ git config branch.master.remote origin
- $ git config branch.master.merge refs/heads/master
之后再重新git pull下。最后git push你的代码吧。it
- ! [rejected] master -> master (non-fast-forward)(有推荐视频)
- ! [rejected] master -> master (non-fast-forward)(有推荐视频)
- Git: ! [rejected] master -> master (non-fast-forward)
- master -> master (non-fast-forward)和git ! [rejected] master -> master (fetch first)
- git 使用以及 部分错误 [rejected] master -> master (fetch first)(non-fast forward)
- git 报错 git [rejected] master -> master (fetch first)(non-fast forward) 的解决方法
- github项目提交失败 master -> master (non-fast-forward)
- github项目提交失败 master -> master (non-fast-forward)
- Eclipse提交代码错误:rejected –non-fast-forward
- Eclipse Push出现rejected - non-fast-forward错误
- Eclipse提交代码错误:rejected –non-fast-forward解决方法
- eclipse提交代码错误:rejected –non-fast-forward解决方法
- git push代码时错误: rejected non-fast-forward
- Eclipse提交代码错误:rejected –non-fast-forward解决方法
- git non-fast-forward
- Git,non-fast-forward
- 【Git】Git上传本地项目的命令以及non-fast-forward updates were rejected的解决办法
- 解决git push 报non-fast-forward updates were rejected错,成功上传project
- 模态窗口经验积累
- jsp+servlet实现验证码功能
- AsyncSocket
- Zend Studio中Zend Debugger的安装与配置(Linux&Windows)
- upd通信代码-linux版本
- ! [rejected] master -> master (non-fast-forward)(有推荐视频)
- ARM裸机环境搭建(U-Boot命令详解)
- net-snmp移植
- XAML 图表动画
- 为什么linux下要configure然后make make install?
- WinFom 通过PrintDocument打印 不显示打印进度提示方法
- VS假死解决方案
- 关于Undefined symbols for architecture armv7s
- jenkins安全和访问控制