Why does git reject on master when pushing to different branch

https://stackoverflow.com/questions/8301431

git
git-flow

22-10-2019
|

Pergunta

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)

Solução

By default, git push tries to update all upstream branches (those matching branch.<name>.merge in your configuration).

Try this:

git config push.default tracking

This tells git to only push commits to the upstream branch matching the name of the local branch you currently have checked out.