Git error (failed to push some refs)解决

当修改了本地仓库后 提交代码时， 用 git push 提示以下错误

error:failed to push some refs to ...
Dealing with “non-fast-forward” errors
From time to time you may encounter this error while pushing:
$ git push origin master 
To ../remote/ 
 ! [rejected]        master -> master (non-fast forward) 
error: failed to push some refs to '../remote/' 
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.

解决办法：
先把git的东西fetch到你本地然后merge后再push

$ git fetch
$ git merge
$ git push