修改代码后在git pull报错：
error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.js Please, commit your changes or stash them before you can merge. Aborting
方法一：压栈
git stash
git pull
git stash pop
方法二：回退到当前版本
git reset --hard
git pull
方法三：放弃修改过的文件
git checkout -- xxx
git pull