需要先fetch，然后再merge，最后上传push(比如使用MyEclipse的git功能)
或者参考以下的链接，用git命令:http://stackoverflow.com/questions/6897600/git-push-failed-non-fast-forward-updates-were-rejected
