error: The following untracked working tree files would be overwritten by merge

使用git pull 时报错了：

error: Your local changes to the following files would be overwritten by merge:
    grails-app/conf/BootStrap.groovy
    grails-app/conf/Config.groovy
    grails-app/controllers/com/capitalbiotech/bpms/ProductController.groovy
    grails-app/controllers/com/capitalbiotech/bpms/ProjectController.groovy
    grails-app/domain/com/capitalbiotech/bpms/Item.groovy
    grails-app/domain/com/capitalbiotech/bpms/Price.groovy
    grails-app/domain/com/capitalbiotech/bpms/Project.groovy
    grails-app/i18n/messages_zh_CN.properties
    grails-app/views/layouts/main.gsp
    grails-app/views/project/_form.gsp
    grails-app/views/project/create.gsp
    grails-app/views/project/edit.gsp
    grails-app/views/project/list.gsp
    grails-app/views/project/mailcontent.gsp
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
    grails-app/conf/raw/perrorTypes
    grails-app/domain/com/capitalbiotech/bpms/PerrorType.groovy
    src/java/bpms/SaleManagerMap.java
    web-app/css/bootstrap-treeview.min.css
    web-app/css/bootstrap/CHANGELOG.md
    web-app/css/bootstrap/Gruntfile.js
    web-app/css/bootstrap/LICENSE
    web-app/css/bootstrap/README.md
    web-app/css/bootstrap/dist/css/bootstrap-theme.css
    web-app/css/bootstrap/dist/css/bootstrap-theme.css.map
    web-app/css/bootstrap/dist/css/bootstrap-theme.min.css
    web-app/css/bootstrap/dist/css/bootstrap-theme.min.css.map
    web-app/css/bootstrap/dist/css/bootstrap.css
    web-app/css/bootstrap/dist/css/bootstrap.css.map
    web-app/css/bootstrap/dist/css/bootstrap.min.css
    web-app/css/bootstrap/dist/css/bootstrap.min.css.map
    web-app/css/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
    web-app/css/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
    web-app/css/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
    web-app/css/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
    web-app/css/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
    web-app/css/bootstrap/dist/js/bootstrap.js
    web-app/css/bootstrap/dist/js/bootstrap.min.js
    web-app/css/bootstrap/dist/js/npm.js
    web-app/css/bootstrap/fonts/glyphicons-halflings-regular.eot
    web-app/css/bootstrap/fonts/glyphicons-halflings-regular.svg
    web-app/css/bootstrap/fonts/glyphicons-halflings-regular.ttf
    web-app/css/bootstrap/fonts/glyphicons-halflings-regular.woff
    web-app/css/bootstrap/fonts/glyphicons-halflings-regular.woff2
    web-app/css/bootstrap/grunt/.jshintrc
    web-app/css/bootstrap/grunt/bs-commonjs-generator.js
    web-app/css/bootstrap/grunt/bs-glyphicons-data-generator.js
    web-app/css/bootstrap/grunt/bs-lessdoc-parser.js
    web-app/css/bootstrap/grunt/bs-raw-files-generator.js
    web-app/css/bootstrap/grunt/change-version.js
    web-app/css/bootstrap/grunt/configBridge.json
    web-app/css/bootstrap/grunt/npm-shrinkwrap.json
    web-app/css/bootstrap/grunt/sauce_browsers.yml
    web-app/css/bootstrap/js/affix.js
    web-app/css/bootstrap/js/alert.js
    web-app/css/bootstrap/js/button.js
    web-app/css/bootstrap/js/carousel.js
    web-app/css/bootstrap/js/collapse.js
    web-app/css/bootstrap/js/dropdown.js
    web-app/css/bootstrap/js/modal.js
    web-app/css/bootstrap/js/popover.js
    web-app/css/bootstrap/js/scrollspy.js
    web-app/css/bootstrap/js/tab.js
    web-app/css/bootstrap/js/tooltip.js
    web-app/css/bootstrap/js/transition.js
    web-app/css/bootstrap/less/alerts.less
    web-app/css/bootstrap/less/badges.less
    web-app/css/bootstrap/less/bootstrap.less
    web-app/css/bootstrap/less/breadcrumbs.less
    web-app/css/bootstrap/less/button-groups.less
    web-app/css/bootstrap/less/buttons.less
    web-app/css/bootstrap/less/carousel.less
    web-app/css/bootstrap/less/close.less
    web-app/css/bootstrap/less/code.less
    web-app/css/bootstrap/less/component-animations.less
    web-app/css/bootstrap/less/dropdowns.less
    web-app/css/bootstrap/less/forms.less
    web-app/css/bootstrap/less/glyphicons.less
    web-app/css/bootstrap/less/grid.less
    web-app/css/bootstrap/less/input-groups.less
    web-app/css/bootstrap/less/jumbotron.less
    web-app/css/bootstrap/less/labels.less
    web-app/css/bootstrap/less/list-group.less
    web-app/css/bootstrap/less/media.less
    web-app/css/bootstrap/less/mixins.less
    web-app/css/bootstrap/less/mixins/alerts.less
    web-app/css/bootstrap/less/mixins/background-variant.less
    web-app/css/bootstrap/less/mixins/border-radius.less
    web-app/css/bootstrap/less/mixins/buttons.less
    web-app/css/bootstrap/less/mixins/center-block.less
    web-app/css/bootstrap/less/mixins/clearfix.less
    web-app/css/bootstrap/less/mixins/forms.less
    web-app/css/bootstrap/less/mixins/gradients.less
    web-app/css/bootstrap/less/mixins/grid-framework.less
    web-app/css/bootstrap/less/mixins/grid.less
    web-app/css/bootstrap/less/mixins/hide-text.less
    web-app/css/bootstrap/less/mixins/image.less
    web-app/css/bootstrap/less/mixins/labels.less
    web-app/css/bootstrap/less/mixins/list-group.less
    web-app/css/bootstrap/less/mixins/nav-divider.less
    web-app/css/bootstrap/
Aborting

采用的方法（强制覆盖本地数据）：

git fetch origin
git clean -f
git reset --hard origin/master