git的版本和本地版本冲突的解决方法

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

Username for 'https://github.com': shiren1118
Password for 'https://shiren1118@github.com': 
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.

引用别人出现的错误信息，是由于readme文件和本地版本冲突：

解决防范有调用以下命令：git push -u origin master -f