我们正在使用 Git Flow。以下是流程:
- git flow feature start myfeat
- git commit -a
- git checkout develop
- git pull
- git flow feature checkout myfeat
- git flow feature rebase myfeat
- git flow feature finish myfeat
- git push
Counting objects: 15, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 820 bytes, done.
Total 8 (delta 6), reused 0 (delta 0)
To git@github.com:blah/blah.git
d675b35..d35f160 develop -> develop
! [rejected] master -> master (non-fast-forward)
当我推送到develop分支时,为什么会告诉我它拒绝了master分支(如果您不熟悉git flow,则develop是一个远程跟踪分支)。