When 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. ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
Solution: git pull --rebase origin master to update the files modified by github to the local
Then git push is ok