Please, commit your changes or stash them before you can merge.
解决
git stash
git pull
git stash pop
Please, commit your changes or stash them before you can merge.
git stash
git pull
git stash pop
转载于:https://my.oschina.net/qiudaozhang/blog/3027187