git报Updates were rejected because the remote contains work that you do not have locally.

原因：远程和本地仓库冲突

解决办法：

git fetch origin //更新远程仓库文件
git diff master origin/master //本地文件和远程仓库文件进行对比
git merge origin/master //自动合并

原文链接：https://blog.csdn.net/trouble0914/article/details/104759238?utm_medium=distribute.pc_aggpage_search_result.none-task-blog-2_{aggregatepage}first_rank_ecpm_v1~rank_v31_ecpm-2-104759238-null-null.pc_agg_new_rank&utm_term=github%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3&spm=1000.2123.3001.4430