commit your changes or stash them before you can merge.
遇到的错误提示:
error: Your local changes to the following files would be overwritten by merge:
xxx/xxx/xxx.java
Please, commit your changes or stash them before you can merge.
Aborting
解决方法:
git stash // 备份到栈
git pull // 拉取更新
git stash pop // 恢复栈到工作区