idea：Git的pull冲突

问题：Your local changes to the following files would be overwritten by merge

            Please, commit your changes or stash them before you can merge.

解决方案：

（1）保存本地所做改动，并入新文件：

1. git stash
2. git pull
3. git stash pop

查看代码合并情况：git diff -w +文件名    

（2）Git文件完全覆盖本地文件

1. git reset 
2. git pull