git push的时候
Merge branch 'master' of github.com:Or-Coal/toutiao-m # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
解决方式:git pull --rebase origin master 将github修改的文件更新到本地
再git push 就ok了