项目场景: git pull 拉取代码的时候报错 Pulling is not possible because you have unmerged files. 解决方案: 1. git add -u 2. git commit -m' ' 3. git pull