Merge the remote changes before pushing again. “not a fast forward”

When you try to push and you get this message that’s mean that someone else has changed after your last fetch.
Well in this case you have to incorporate their changes before you can add yours typically, you’ll want to rebase rather than merge and you’ll also want to test the joined version.

$ git fetch
$ git diff master…origin/master

that’ll show changes of upstream
$ git fetch origin
$ git rebase origin/master
$ git push prigin master

Merge the remote changes before pushing again. “not a fast forward”

2 thoughts on “Merge the remote changes before pushing again. “not a fast forward”

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s