git合并出现冲突：
Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
解决方案：
git stash //使返回到自己上一个commit，先隐藏
git pull origin master //拉取最新的代码
git stash pop //回到自己修改的代码
原文：https://www.cnblogs.com/heqiyoujing/p/9726324.html