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.

That did it! Thanks so much!

Hello,

I’m having some trouble with the update when I tried to install I get this error

Updating de57daa..b508a62
error: Your local changes to the following files would be overwritten by merge:
	package-lock.json
Please commit your changes or stash them before you merge.
Aborting

when I try to remove the offending file I get this

rm: cannot remove 'pacage-lock.json': No such file or directory
pi@raspberrypi:~/MagicMirror $ rm package-lock.json
rm: cannot remove 'package-lock.json': No such file or directory

Does anyone have any clue how I proceed?

Is there something I can put in the command line to stop Magic Mirror/raspberry pi from going to sleep. I tried downloading a screensaver program but that doesn’t seem to be effective.

@phreakinuts yeah. It’s the same issue

pi@raspberrypi:~ $ pm2 stop mm

[PM2] Applying action stopProcessId on app [mm](ids: 0)
[PM2] [mm](0) ✓
┌─────────────┬────┬───────┬────────┬─────────┬──────┬────────┬──────────┐
│ Name        │ id │ mode  │ status │ ↺       │ cpu  │ memory │
├─────────────┼────┼───────┼────────┼─────────┼──────┼────────┼──────────┤
│ MagicMirror │ 1  │ 2.6.0 │ fork   │ online  │ 2961 │ 0%     │ 2.5 MB   │
│ mm          │ 0  │ N/A   │ fork   │ stopped │ 2961 │ 0%     │ 0 B      │
└─────────────┴────┴───────┴────────┴─────────┴──────┴────────┴──────────┘
 Use `pm2 show <id|name>` to get more details about an app
pi@raspberrypi:~ $ pm2 delete mm
[PM2] Applying action deleteProcessId on app [mm](ids: 0)
[PM2] [mm](0) ✓
┌─────────────┬────┬───────┬────────┬────────┬──────┬────────┬──────────┐
│ Name        │ id │ mode  │ status │ ↺      │ cpu  │ memory │
├─────────────┼────┼───────┼────────┼────────┼──────┼────────┼──────────┤
│ MagicMirror │ 1  │ 2.6.0 │ fork   │ online │ 2961 │ 0%     │ 2.5 MB   │
└─────────────┴────┴───────┴────────┴────────┴──────┴────────┴──────────┘
 Use `pm2 show <id|name>` to get more details about an app
pi@raspberrypi:~ $ rm mm.sh

Did I not do it right?

Sorry for the delay. I was out of town and forgot my laptop charging cable.

@bhepler said in strange boot issuse:

@jhwwhite - I have a lot of questions, so bear with me.

1. Did you ever get the MagicMirror to work the way you expected?
   Yes I did
2. Do you ever see the Raspberry Pi’s desktop during the boot sequence?
   No. It goes strait to the Magic Mirror boot page
3. Are you using the latest version of Raspbian full edition (not Lite)?
   It’s the full version I believe
4. Once you see that command line, can you SSH into the Pi?
   Yes
5. If 4 is true, can you run the pm2 log 0 command and let us know what the logs say?
   Sure

0|mm       | > magicmirror@2.6.0 start /home/pi/MagicMirror
0|mm       | > sh run-start.sh
0|mm       | 
0|mm       | 
0|mm       | > magicmirror@2.6.0 start /home/pi/MagicMirror
0|mm       | > sh run-start.sh
0|mm       | 
0|mm       | 
0|mm       | > magicmirror@2.6.0 start /home/pi/MagicMirror
0|mm       | > sh run-start.sh
0|mm       | 
0|mm       | 
0|mm       | > magicmirror@2.6.0 start /home/pi/MagicMirror
0|mm       | > sh run-start.sh
0|mm       | 

/home/pi/.pm2/logs/mm-error.log last 15 lines:
0|mm       | 
0|mm       | npm ERR! A complete log of this run can be found in:
0|mm       | npm ERR!     /home/pi/.npm/_logs/2019-01-13T19_30_43_236Z-debug.log
0|mm       | 
0|mm       | (electron:3869): Gtk-WARNING **: cannot open display: :0
0|mm       | npm ERR! code ELIFECYCLE
0|mm       | npm ERR! errno 1
0|mm       | npm ERR! magicmirror@2.6.0 start: `sh run-start.sh`
0|mm       | npm ERR! Exit status 1
0|mm       | npm ERR! 
0|mm       | npm ERR! Failed at the magicmirror@2.6.0 start script.
0|mm       | npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
0|mm       | 
0|mm       | npm ERR! A complete log of this run can be found in:
0|mm       | npm ERR!     /home/pi/.npm/_logs/2019-01-13T19_30_48_977Z-debug.log

0|mm  | > magicmirror@2.6.0 start /home/pi/MagicMirror
0|mm  | > sh run-start.sh
0|mm  | (electron:3938): Gtk-WARNING **: cannot open display: :0
0|mm  | npm
0|mm  |  ERR! code ELIFECYCLE
0|mm  | npm ERR! errno 1
0|mm  | npm
0|mm  |  ERR! magicmirror@2.6.0 start: `sh run-start.sh`
0|mm  | npm ERR! Exit status 1
0|mm  | npm
0|mm  |  ERR! 
0|mm  | npm ERR! Failed at the magicmirror@2.6.0 start script.
0|mm  | npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
0|mm  | npm ERR! A complete log of this run can be found in:
0|mm  | npm ERR!     /home/pi/.npm/_logs/2019-01-13T19_30_54_950Z-debug.log
0|mm  | > magicmirror@2.6.0 start /home/pi/MagicMirror
0|mm  | > sh run-start.sh
0|mm  | (electron:4002): Gtk-WARNING **: cannot open display: :0
0|mm  | npm
0|mm  |  ERR! code ELIFECYCLE
0|mm  | npm ERR! errno 1
0|mm  | npm
0|mm  |  ERR! magicmirror@2.6.0 start: `sh run-start.sh`
0|mm  | npm ERR! Exit status 1
0|mm  | npm
0|mm  |  ERR! 
0|mm  | npm ERR! Failed at the magicmirror@2.6.0 start script.
0|mm  | npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
0|mm  | npm ERR! A complete log of this run can be found in:
0|mm  | npm ERR!     /home/pi/.npm/_logs/2019-01-13T19_31_00_675Z-debug.log
0|mm  | > magicmirror@2.6.0 start /home/pi/MagicMirror
0|mm  | > sh run-start.sh
0|mm  | (electron:4066): Gtk-WARNING **: cannot open display: :0
0|mm  | npm
0|mm  |  ERR!
0|mm  |  code ELIFECYCLE
0|mm  | npm 
0|mm  | ERR! errno 1
0|mm  | npm
0|mm  |  ERR! magicmirror@2.6.0 start: `sh run-start.sh`
0|mm  | npm ERR! Exit status 1
0|mm  | npm 
0|mm  | ERR! 
0|mm  | npm ERR! Failed at the magicmirror@2.6.0 start script.
0|mm  | npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
0|mm  | npm ERR! A complete log of this run can be found in:
0|mm  | npm ERR!

It just keeps going on like that

So, I’ve got magic mirror installed. Once I updated a weird thing started to happen. In the middle of the Magic Mirror boot sequence. A command line shows up on top of the halfway booted Magic Mirror program. I’ve tried a fresh reboot Magic Mirror but no dice. Any suggestions? (I’m trying to upload a photo but that doesn’t seem to be be working)

Yes. I’m going to try tor reinstall again. (Although, that didn’t work last time.) Any advice is appreciated.

I’ve very new to this, and I’m a little stuck. As far as I can tell I’ve followed all the instructions I could find, but I don’t know what to do from here. Any advice would be appreciated.

(node:27999) [DEP0022] DeprecationWarning: os.tmpDir() is deprecated. Use os.tmpdir() instead.
npm WARN package.json current-week-number@1.0.7 license should be a valid SPDX license expression
npm WARN package.json rrule-alt@2.2.8 No license field.
npm WARN package.json valid-url@1.0.9 No license field.
npm WARN deprecated time-grunt@2.0.0: Deprecated because Grunt is practically unmaintained. Move on to something better. This package will continue to work with Grunt v1, but it will not receive any updates.
npm ERR! Error: Method Not Allowed
npm ERR!     at errorResponse (/usr/share/npm/lib/cache/add-named.js:260:10)
npm ERR!     at /usr/share/npm/lib/cache/add-named.js:203:12
npm ERR!     at saved (/usr/share/npm/node_modules/npm-registry-client/lib/get.js:167:7)
npm ERR!     at FSReqWrap.oncomplete (fs.js:135:15)
npm ERR! If you need help, you may report this *entire* log,
npm ERR! including the npm and node versions, at:
npm ERR!     <http://github.com/npm/npm/issues>

npm ERR! System Linux 4.14.79-v7+
npm ERR! command "/usr/bin/node" "/usr/bin/npm" "install"
npm ERR! cwd /home/pi/MagicMirror
npm ERR! node -v v8.11.1
npm ERR! npm -v 1.4.21
npm ERR! code E405
npm ERR! 
npm ERR! Additional logging details can be found in:
npm ERR!     /home/pi/MagicMirror/npm-debug.log
npm ERR! not ok code 0