git 无法pull这个问题怎么处理

Question

Answer 1

You have some unmerged files. So, first do commit or stash the files.

$ git commit -am <message>          # add and commit
$ git pull origin master            # pull origin

Or,
$ git add .                         
$ git stash                         # remove the files
$ git pull origin master