How to merge remote changes at GitHub?

Viewed 157917

I'm getting following error, whn trying first Github push:

[rejected] master -> master (non-fast forward)
error: failed to push some refs to 'git@github.com:me/me.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'non-fast forward'
section of 'git push --help' for details.

how can I fix this and merge remote changes?

7 Answers

You can also force a push by adding the + symbol before your branch name.

git push origin +some_branch
Related