当我尝试进行第一次 Github 推送时,我遇到了以下错误:
[rejected] master -> master (non-fast forward)
error: failed to push some refs to 'git@github.com:me/me.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'non-fast forward'
section of 'git push --help' for details.
我该如何修复这个问题并合并远程更改?
git pull
之后,再进行一次提交,然后就应该没问题了。 - Patrickgit checkout other-branch; git pull; git push; git checkout branch-i-was-working-on
。 - Noah Spurrier