U
error: Your local changes to the following files would be overwritten by merge:
backend/bin/www
backend/controlles/ecopool-controller/index.js
backend/routes/user/index.js
backend/sockets/index.js
config/development.json
dist/index.html
install_win.bat
package.json
src/assets/scss/index.scss
src/components/layout/sidebar/sidebar.vue
src/pages/Dashboard.vue
src/router/index.js
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
backend/controlles/ecopool-controller/addMnemonic.js
backend/controlles/ecopool-controller/getMnemonic.js
backend/routes/user/addMnemonic.js
backend/routes/user/getMnemonic.js
dist/js/chunk-vendors.7c2b56f8.js
dist/js/chunk-vendors.7c2b56f8.js.map
public/Ecopool Group.url
public/images/ecopool.ico
src/assets/scss/pages/mnemonics.scss
src/pages/Mnemonics.vue
Please move or remove them before you merge.
Aborting
Updating 9f00254..d84ca1b