当我试图将我的代码推送到GitHub时,我遇到了一些问题。
Pushing to git@github.com:519ebayproject/519ebayproject.git
To git@github.com:519ebayproject/519ebayproject.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:519ebayproject/519ebayproject.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
我还没有在存储库中推入任何东西,那么为什么我需要拉出一些东西呢?
有些人可能会遇到这个错误,因为Git不知道您要推哪个分支。
如果您的错误消息还包括
error: failed to push some refs to 'git@github.com:jkubicek/my_proj.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. If you did not intend to push that branch, you may want to
hint: specify branches to push or set the 'push.default' configuration
hint: variable to 'current' or 'upstream' to push only the current branch.
那么你可能想要遵循Jim Kubicek的提示,将Git配置为只推送当前分支,将默认分支设置为当前分支。
git config --global push.default current
您的分支应该在注意到最新合并的更改时立即包含它们,但是您还没有提取最新的更改。
git fetch
也许这就是所需要的。如果这不起作用,那么你可能需要:
git pull <sharedRepo> <branch> --rebase
如果您没有任何合并冲突,您应该能够成功地推动您的更改。
git push <forkedRepo> <branch>
如果您遇到合并冲突,您无法在GitHub中远程解决。您必须在本地解决它们,然后使用强制标签推动解决方案,因为合并冲突解决方案将更改历史记录。
git push <forkedRepo> <branch> -f