Git push origin development failure: non-fast-forward

0

I'm developing a system and the situation is this: I created some new files on my machine and I want to send it to Bitbucket but it will not. When I was creating I was giving commits, but, my colleague in development, gave other commits and sent to Bitbucket before me, which have commits younger and older than his commits When I give the command git push origin development , the following message appears:

! [rejected]        development -> development (non-fast-forward)
error: failed to push some refs to 'https://[...]/migration.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Execute git status and say that there is nothing to commit. I execute git pull origin development and say that everything is already up to date. I'm using Bitbucket. Do I have to send the new files to the server manually?

    
asked by anonymous 25.07.2017 / 21:07

0 answers