Git 合并报错

解决冲突的方法很简单，先检出 Master，放弃所有文件修改，再进行分支合并即可。
$ git checkout .
$ rm -f public/mix-manifest.json
$ git merge filling-layout-style

git 做了以上操作报错
error: The following untracked working tree files would be overwritten by merge:
public/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.eot
public/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.svg
public/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.ttf
public/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.woff
public/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.woff2
Please move or remove them before you merge.
Aborting
Updating b7f0f58..dc476c6