赞
踩
使用git push -u origin master,把本地代码推送到远程仓库,出现如下错误
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
这是因为本地的代码不是最新的,把远程master最新的代码更新到本地就可以了,
使用命令: git pull origin master
之后又出现了错误:fatal: refusing to merge unrelated histories
解决方法:使用以下命令,强制合并
git pull origin master --allow-unrelated-histories
后面加上 --allow-unrelated-histories
, 把两段不相干的 分支进行强行合并
后面再push就可以了
Copyright © 2003-2013 www.wpsshop.cn 版权所有,并保留所有权利。