We’re using git flow. Here is the 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
error:
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)
Why does it tell me that it’s rejecting master when i’m pushing to develop (develop is a remote tracking branch if your not familiar with git flow)
By default,
git pushtries to update all upstream branches (those matchingbranch.<name>.mergein your configuration).Try this:
This tells git to only push commits to the upstream branch matching the name of the local branch you currently have checked out.
See also
git-config(1)manpage