异常1
Git Pull Failed
Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
Exiting because of an unresolved conflict.
解决:
1. git add -u
2. git commit -m ''
3. git pull