一般来说报错三酱紫的：
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 rm命令来操作，但是如果不小心使用了rm命令，
导致本地仓库(master)和远程仓库(origin)不同步，怎么办？在这种情况下，
即使git commit -a 也是无济于事的。
先pull远程仓库，然后和本地仓库合并，最后提交即可。
$git pull origin
$git merge origin master
$git push origin