Git error: ! [rejected] master -> master (non-fast-forward)

git github bitbucket master
YaSh Chaudhary picture YaSh Chaudhary · Mar 8, 2017 · Viewed 15.6k times · Source

I was updating my project and when tried to upload it to my repository,got the following error:

Already did

git pull --rebase origin master

  ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://*******/production.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I need to update my website but not able to do so.

EDIT 1:

> git status gives:

rebase in progress; onto cda02b2 You are currently rebasing branch 'master' on 'cda02b2'. (all conflicts fixed: run "git rebase --continue")

nothing to commit, working directory clean

Answer

ckruczek picture ckruczek · Mar 8, 2017

As git tells you in the output It seems that there is already a rebase-apply directory, and I wonder if you are in the middle of another rebase. If that is the case, please try git rebase (--continue | --abort | --skip) you are in the middle of a rebase. You first have to abort or continue this rebase by

git rebase --continue or

git rebase --abort

and then pull again with

git pull --rebase origin master

Related questions

How to remove a directory from git repository?

I have 2 directories on my GitHub repository. I'd like to delete one of them. How could I do that without deleting and re-creating entire repository?

Read More
What I can do to resolve "1 commit behind master"?

After pushing I've been seeing this message at remote repository: 1 commit behind master. This merge has conflicts that must be resolved before it can be committed. To manually merge these changes into TA20footerLast run the following commands: git checkout 7…

Read More
git pull error "The requested URL returned error: 503 while accessing"

I've been facing problems accessing my git repository lately. It worked perfectly fine earlier but now I cannot run any command on CLI. I can however, access the corresponding Web Page, Could someone help me how to resolve this issue?

Read More