git push 报non-fast-forward updates were rejected 错误

错误：

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

解决办法：

1，强推，即利用强覆盖方式用你本地的代码替代git仓库内的内容

git push -f  -u origin master

2，先把git的东西fetch到你本地而后merge后再push

$ git fetch

$ git merge