MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.

    update help.

    Scheduled Pinned Locked Moved Unsolved Troubleshooting
    1 Posts 1 Posters 402 Views 1 Watching
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • J Offline
      jhwwhite
      last edited by

      Trying to install an update and I keep getting an error with merging. I tried to git reset and…

      error: Pulling is not possible because you have unmerged files.
      hint: Fix them up in the work tree, and then use 'git add/rm <file>'
      hint: as appropriate to mark resolution and make a commit.
      fatal: Exiting because of an unresolved conflict.
      pi@raspberrypi:~/MagicMirror $ git merge package-lock.json
      error: Merging is not possible because you have unmerged files.
      hint: Fix them up in the work tree, and then use 'git add/rm <file>'
      hint: as appropriate to mark resolution and make a commit.
      fatal: Exiting because of an unresolved conflict.
      pi@raspberrypi:~/MagicMirror $ git reset
      Unstaged changes after reset:
      M	.eslintignore
      M	.eslintrc.json
      D	.stylelintrc
      M	CHANGELOG.md
      M	Gruntfile.js
      M	README.md
      M	clientonly/index.js
      M	config/config.js.sample
      M	dangerfile.js
      M	installers/raspberry.sh
      M	js/app.js
      M	js/class.js
      M	js/electron.js
      M	js/loader.js
      M	js/main.js
      M	js/module.js
      M	js/server.js
      M	js/translator.js
      M	modules/README.md
      M	modules/default/alert/alert.js
      M	modules/default/calendar/README.md
      M	modules/default/calendar/calendar.js
      M	modules/default/calendar/calendarfetcher.js
      M	modules/default/calendar/debug.js
      M	modules/default/calendar/node_helper.js
      M	modules/default/calendar/vendor/ical.js/.travis.yml
      M	modules/default/calendar/vendor/ical.js/example.js
      M	modules/default/calendar/vendor/ical.js/ical.js
      M	modules/default/calendar/vendor/ical.js/node-ical.js
      M	modules/default/calendar/vendor/ical.js/package.json
      M	modules/default/calendar/vendor/ical.js/readme.md
      M	modules/default/calendar/vendor/ical.js/test/test.js
      M	modules/default/clock/README.md
      M	modules/default/clock/clock.js
      M	modules/default/compliments/compliments.js
      M	modules/default/currentweather/README.md
      M	modules/default/currentweather/currentweather.js
      M	modules/default/helloworld/helloworld.js
      M	modules/default/newsfeed/README.md
      M	modules/default/newsfeed/fetcher.js
      M	modules/default/newsfeed/newsfeed.js
      M	modules/default/updatenotification/node_helper.js
      M	modules/default/updatenotification/updatenotification.js
      M	modules/default/weather/README.md
      M	modules/default/weather/current.njk
      M	modules/default/weather/forecast.njk
      M	modules/default/weather/providers/README.md
      M	modules/default/weather/providers/darksky.js
      M	modules/default/weather/providers/openweathermap.js
      M	modules/default/weather/providers/weathergov.js
      M	modules/default/weather/weather.js
      M	modules/default/weather/weatherobject.js
      M	modules/default/weather/weatherprovider.js
      M	modules/default/weatherforecast/README.md
      M	modules/default/weatherforecast/weatherforecast.css
      M	modules/default/weatherforecast/weatherforecast.js
      M	package-lock.json
      M	package.json
      M	tests/configs/check_config.js
      M	tests/configs/env.js
      M	tests/configs/modules/positions.js
      M	tests/configs/port_8090.js
      M	tests/e2e/dev_console.js
      M	tests/e2e/env_spec.js
      M	tests/e2e/fonts.js
      M	tests/e2e/global-setup.js
      M	tests/e2e/ipWhistlist_spec.js
      M	tests/e2e/modules/calendar_spec.js
      M	tests/e2e/modules/clock_es_spec.js
      M	tests/e2e/modules/clock_spec.js
      M	tests/e2e/modules/compliments_spec.js
      M	tests/e2e/modules/helloworld_spec.js
      M	tests/e2e/modules/newsfeed_spec.js
      M	tests/e2e/modules_position_spec.js
      M	tests/e2e/port_config.js
      M	tests/e2e/translations_spec.js
      M	tests/e2e/vendor_spec.js
      M	tests/e2e/without_modules.js
      M	tests/servers/basic-auth.js
      M	tests/unit/classes/class_spec.js
      M	tests/unit/classes/deprecated_spec.js
      M	tests/unit/classes/translator_spec.js
      M	tests/unit/classes/utils_spec.js
      M	tests/unit/functions/calendar_spec.js
      M	tests/unit/functions/cmp_versions_spec.js
      M	tests/unit/functions/currentweather_spec.js
      M	tests/unit/functions/newsfeed_spec.js
      M	tests/unit/functions/weatherforecast_spec.js
      M	tests/unit/global_vars/defaults_modules_spec.js
      M	tests/unit/global_vars/root_path_spec.js
      M	translations/en.json
      M	translations/fi.json
      M	translations/ru.json
      M	translations/sv.json
      M	translations/translations.js
      D	vendor/package-lock.json
      D	vendor/package.json
      M	vendor/vendor.js
      pi@raspberrypi:~/MagicMirror $ git reset --hard
      HEAD is now at 078d406 commit
      pi@raspberrypi:~/MagicMirror $ git pull && npm install
      error: The following untracked working tree files would be overwritten by merge:
      	.github/stale.yml
      	.stylelintrc.json
      	modules/default/calendar/vendor/ical.js/example_rrule.js
      	modules/default/calendar/vendor/ical.js/examples/example_rrule.ics
      	modules/default/calendar/vendor/ical.js/test/test12.ics
      	modules/default/calendar/vendor/ical.js/test/test13.ics
      	modules/default/calendar/vendor/ical.js/test/test14.ics
      	modules/default/weather/providers/ukmetoffice.js
      Please move or remove them before you merge.
      Aborting
      

      Any help would be appreciated.

      1 Reply Last reply Reply Quote 0
      • 1 / 1
      • First post
        Last post
      Enjoying MagicMirror? Please consider a donation!
      MagicMirror created by Michael Teeuw.
      Forum managed by Sam, technical setup by Karsten.
      This forum is using NodeBB as its core | Contributors
      Contact | Privacy Policy