npm run dev_win 可在本地打包，浏览器上能访问

npm run dist_win 可在本地webpack，浏览器上能访问

都是在v1.0的分支上，可以登陆http://admin.happymmall.com

而在master上，分支切换不了，无法合并

$ git checkout master
error: Your local changes to the following files would be overwritten by checkou                                                                                                                                                                                                                                                                                           t:
        admin-fe/webpack.config.js
Please, commit your changes or stash them before you can switch branches.
error: The following untracked working tree files would be overwritten by checko                                                                                                                                                                                                                                                                                           ut:
        admin-fe/favicon.ico
Please move or remove them before you can switch branches.
Aborting

这个 favicon.ico  是做什么用的，在项目里一直报红，但在v1.0 admin-fe运行正常

分支是否一定要合并，我的目录正常的不

Tom@Tom-PC MINGW64 ~/Desktop/maipai/admin-fe (wymaipai_v1.0)
$ ls -al
total 45
drwxr-xr-x 1 Tom 197121    0 十月 17 08:54 ./
drwxr-xr-x 1 Tom 197121    0 十月 16 11:50 ../
-rw-r--r-- 1 Tom 197121   44 六月 22 01:54 .gitignore
drwxr-xr-x 1 Tom 197121    0 十月 16 09:47 dist/
-rw-r--r-- 1 Tom 197121 9662 六月 22 01:54 favicon.ico
drwxr-xr-x 1 Tom 197121    0 十月 16 10:34 node_modules/
-rw-r--r-- 1 Tom 197121 1352 十月 16 09:22 package.json
-rw-r--r-- 1 Tom 197121  867 十月 16 11:05 README.md
drwxr-xr-x 1 Tom 197121    0 十月 13 04:37 src/
-rw-r--r-- 1 Tom 197121 3480 十月 17 08:56 webpack.config.js

现在要切换分支，合并到master上，消除掉那个admin-fe/webpack.config.js 文件报红，咋破