Your local changes to the following files would be overwritten by merge: Please commit your changes or stash them before you merge.
本地修改部分代码，没有commit ，想拉取远程最新代码，有冲突。
解决办法：
git stash //暂存工作区
git pull origin master
git stash pop
