Need help, can't update



  • Hi everyone! Hope you’re finding very well!

    I’ve made the update by using git pull && npm install, but I get this:

    git pull
    Updating 8010e62…1a2b4f8
    error: Your local changes to the following files would be overwritten by merge:
    .eslintignore
    .github/PULL_REQUEST_TEMPLATE.md
    .gitignore
    .travis.yml
    CHANGELOG.md
    Gruntfile.js
    LICENSE.md
    README.md
    css/main.css
    index.html
    installers/raspberry.sh
    js/app.js
    js/defaults.js
    js/electron.js
    js/loader.js
    js/main.js
    js/module.js
    js/server.js
    modules/README.md
    modules/default/alert/README.md
    modules/default/calendar/README.md
    modules/default/calendar/calendar.js
    modules/default/calendar/calendarfetcher.js
    modules/default/calendar/debug.js
    modules/default/calendar/node_helper.js
    modules/default/calendar/vendor/ical.js/ical.js
    modules/default/calendar/vendor/ical.js/node-ical.js
    modules/default/clock/README.md
    modules/default/clock/clock.js
    modules/default/compliments/README.md
    modules/default/compliments/compliments.js
    modules/default/currentweather/README.md
    modules/default/currentweather/currentweather.js
    modules/default/helloworld/README.md
    modules/default/newsfeed/README.md
    modules/default/newsfeed/fetcher.js
    modules/default/newsfeed/newsfeed.js
    modules/default/newsfeed/node_helper.js
    modules/default/updatenotification/README.md
    modules/default/weatherforecast/README.md
    modules/default/weatherforecast/weatherforecast.css
    modules/default/weatherforecast/weatherforecast.js
    modules/node_modules/node_helper/index.js
    package.json
    splashscreen/MagicMirror.script
    splashscreen/splash.png
    translations/da.json
    translations/de.json
    translations/en.json
    translations/es.json
    translations/fi.json
    translations/fr.json
    translations/fy.json
    translations/gr.json
    translations/it.json
    translations/ja.json
    translations/nb.json
    translations/nl.json
    translations/nn.json
    translations/pl.json
    translations/pt.json
    translations/pt_br.json
    translations/sv.json
    translations/tr.json
    translations/translations.js
    translations/zh_cn.json
    translations/zh_tw.json
    vendor/font-awesome-4.5.0/HELP-US-OUT.txt
    vendor/font-awesome-4.5.0/css/font-awesome.css
    vendor/font-awesome-4.5.0/css/font-awesome.min.css
    vendor/font-awesome-4.5.0/fonts/FontAwesome.otf
    vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.eot
    vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.svg
    vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf
    vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.woff
    vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2
    vendor/font-awesome-4.5.0/less/animated.less
    vendor/font-awesome-4.5.0/less/bordered-pulled.less
    vendor/font-awesome-4.5.0/less/core.less
    vendor/font-awesome-4.5.0/less/fixed-width.less
    vendor/font-awesome-4.5.0/less/font-awesome.less
    vendor/font-awesome-4.5.0/less/icons.less
    vendor/font-awesome-4.5.0/less/larger.less
    vendor/font-awesome-4.5.0/less/list.less
    vendor/font-awesome-4.5.0/less/mixins.less
    vendor/font-awesome-4.5.0/less/path.less
    vendor/font-awesome-4.5.0/less/rotated-flipped.less
    vendor/font-awesome-4.5.0/less/stacked.less
    vendor/font-awesome-4.5.0/less/variables.less
    vendor/font-awesome-4.5.0/scss/_animated.scss
    vendor/font-awesome-4.5.0/scss/_bordered-pulled.scss
    vendor/font-awesome-4.5.0/scss/_core.scss
    vendor/font-awesome-4.5.0/scss/_fixed-width.scss
    vendor/font-awesome-4.5.0/scss/_icons.scss
    vendor/font-awesome-4.5.0/scss/_larger.scss
    vendor/font-awesome-4.5.0/scss/_list.scss
    vendor/font-awesome-4.5.0/scss/_mixins.scss
    vendor/font-awesome-4.5.0/scss/_path.scss
    vendor/font-awesome-4.5.0/scss/_rotated-flipped.scss
    vendor/font-awesome-4.5.0/scss/_stacked.scss
    vendor/font-awesome-4.5.0/scss/_variables.scss
    vendor/font-awesome-4.5.0/scss/font-awesome.scss
    vendor/moment/moment-timezone.js
    vendor/moment/moment-with-locales.js
    vendor/moment/moment-with-locales.min.js
    vendor/vendor.js
    vendor/weather-icons/css/weather-icons-wind.css
    vendor/weather-icons/css/weather-icons-wind.min.css
    vendor/weather-icons/css/weather-icons.css
    vendor/weather-icons/css/weather-icons.min.css
    Please, commit your changes or stash them before you can merge.
    Aborting

    Any idea why?

    Kind regards


Log in to reply
 

Looks like your connection to MagicMirror Forum was lost, please wait while we try to reconnect.