我正在处理一个Git仓库,我有自己的分支(名为jviotti),并且我的更改已经合并到主分支。现在,在提交了一些更改后,我发现无法将更改推送到我的分支。
$ git push origin jviotti
To https://github.com/jorisbontje/pikapay-frontend.git
! [rejected] jviotti -> jviotti (non-fast-forward)
error: failed to push some refs to 'https://github.com/jorisbontje/pikapay-frontend.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
我尝试使用 git pull 命令:
$ git pull
You asked me to pull without telling me which branch you
want to rebase against, and 'branch.jviotti.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
If you often rebase against the same branch, you may want to
use something like the following in your configuration file:
[branch "jviotti"]
remote = <nickname>
merge = <remote-ref>
rebase = true
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
在浏览了SO上一个类似的问题后,我尝试了以下方法:
$ git pull origin master:jviotti
From https://github.com/jorisbontje/pikapay-frontend
! [rejected] master -> jviotti (non-fast-forward)
我觉得那应该可以解决问题。我错在哪里了?
git pull origin jviotti
吗? - Jonas Schäfergit branch
命令时,你会看到什么? - Eric Walker