标签：because led 团队开发 int style master use rem --
在push代码到远程仓库时，报了如下的错误：
$ git push -u origin master
To https://github.com/11pdg/group-buy.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to ‘https://github.com/11pdg/group-buy.git‘
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: ‘git pull ...‘) before pushing again.
hint: See the ‘Note about fast-forwards‘ in ‘git push --help‘ for details.
查阅资料得知，是因为在github上创建仓库的时候，顺便也创建了README文件，然而本地仓库又没有这个文件，所以导致版本冲突。
有以下几种解决方法：
1、强制push到远程仓库：
git push -u origin master -f
但是这样会导致远程仓库里的东西丢失，一般不会采用这样的方法，特别是团队开发的时候。
2、push前先将远程仓库pull下来，再进行push：
git pull origin master
git push -u origin msater
3、创建新的分支：
git branch [name]
git push -u origin [name]
标签：because led 团队开发 int style master use rem --
原文地址：http://www.cnblogs.com/11lang/p/6130927.html
