情景：

在github上創建項目，然後本地git init

然後沒有git pull -f --all

然後git add . | git commit -am "init"

導致github上的版本裏有readme文件和本地版本沖突，下面給出沖突原因：

[master][~/Downloads/ios] git push -u origin master

Username for ‘https://github.com‘: shiren1118
Password for ‘https://[email protected]‘:
To https://github.com/shiren1118/iOS_code_agile.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to ‘https://github.com/shiren1118/iOS_code_agile.git‘
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. ‘git pull‘)
hint: before pushing again.
hint: See the ‘Note about fast-forwards‘ in ‘git push --help‘ for details.

查看大部分資料，只有這個有用

http://www.cnblogs.com/xwdreamer/archive/2012/05/29/2523958.html

勾選強制覆蓋已有的分支（可能會丟失改動），再點擊上傳，上傳成功。

只有這句是核心，所以，本人就略微想了一下

[master][~/Downloads/ios] git push -u origin master -f

至此，搞定問題

github上的版本和本地版本沖突的解決方法