文章转载自：http://blog.csdn.net/chain2012/article/details/7476493
当要push代码到git时，出现提示：
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 config branch.dev.remote origin
git config branch.dev.merge refs/heads/dev