用git pull拉取远程分支代码时候遇到如下问题: error: Your local changes to the following files would be overwritten by merge: a.js b.js Please, commit your changes or stash them before you can merge. 原因是:别人修改了a.js和b.js到版本库中,你本地也修改了a.js和b.js,此时你git pull操作就出现了冲突,解决方法上面提示…