git 解决push报错

今天对代码进行了修改优化，然后往往远程push，但push后报错了

1.git 操作

git add .
git commit -m"fix"
git push origin master:dev-gaochao

2. 报错信息

To https://amc-msra.visualstudio.com/trading-algo/_git/real-trading
 ! [rejected]        master -> dev-gaochao (fetch first)
error: failed to push some refs to 'https://amc-msra.visualstudio.com/trading-algo/_git/real-trading'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

3. 原因

之所以出现这个原因，是因为我在线上生成、编辑了README.md文件，而本地代码文件中不包含它，所以线上线下就对不上了。

4. 解决</