GIT拉其他分支后无法推动

Question

I was working on admin branch, but I needed some things done in develop branch, so git pull origin develop was my choice.

After some days working (still on admin but with thoose develop things) I want to push to admin so everything gets OK.

I get this error ! [rejected] admin -> admin (non-fast-forward) error: failed to push some refs to 'git@git.mygit.com:mygit/mygit.git' consejo: Updates were rejected because the tip of your current branch is behind consejo: its remote counterpart. Integrate the remote changes (eg consejo: 'git pull ...') before pushing again. consejo: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] admin -> admin (non-fast-forward) error: failed to push some refs to 'git@git.mygit.com:mygit/mygit.git' consejo: Updates were rejected because the tip of your current branch is behind consejo: its remote counterpart. Integrate the remote changes (eg consejo: 'git pull ...') before pushing again. consejo: See the 'Note about fast-forwards' in 'git push --help' for details.

If I try to do a git pull I am getting things from develop again and breaks everything I've made (I'm doing with rebase ) even if I do git pull origin admin .

I was the only one working on admin branch, and develop one person too without touching admin

git branch -vv

* admin   238eab7 [origin/admin: ahead 37, behind 9] Entidades remodeladas. Mapeo de entidades separadas a YAML para mejor organización Limpieza de varias cosas que sobraban (bundles y demás) Separadas las configuraciones por tipo. Separados los servicios por bundle y tipo siguiendo las recomendaciones de Symfony2
  develop 7cc5c84 [origin/develop: behind 22] Eurotax funcinoando. Quitado Memcached en el entorno de DEV para DQL y metido en PROD

Answer 1

If you did the pull with rebase option, you take the admin changes and put on top of develop changes(with new commits). so the commits on the admin branch do not exist on your local branch anymore, it got replace by new ones. if you are shure that your changes are correct you have to push with --force option. like:

git push --force origin admin

When you do a pull with --rebase option, you have to use --force to replace the contents on remote repository.