Please commit your changes or stash them before you merge?

jefftse

I tried to update my mirror tonight but i’m getting this.

jeff@raspberrypi:~/MagicMirror $ sudo git pull && npm run install-mm
Updating 94c3c69…c24de64
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
package.json
Please commit your changes or stash them before you merge.
Aborting

please advise

sdetweil

@jefftse ok short path

sudo npm install n -g 
sudo n 20.18.1
cd ~/MagicMirror
npm run install-mm

sdetweil

@jefftse

1.NEVER use sudo when doing anything w MagicMirror files

what is changed in package.json!

git diff package.json

BKeyport

@sdetweil Don’t NPM install touch the package.json - or is it just package-lock?

Either way, @jefftse can just delete package-lock.json for that error.

sdetweil

@BKeyport npm does not change package.json

jefftse

@sdetweil
jeff@raspberrypi:~/MagicMirror $ git diff package.json
diff --git a/package.json b/package.json
index 7b80b4e…aa80952 100644
— a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
“ajv”: “^8.17.1”,
“ansis”: “^3.3.2”,
“console-stamp”: “^3.1.2”,

          "electron-version": "^2.0.1",
          "envsub": "^4.1.0",
          "eslint": "^9.11.1",
          "express": "^4.21.0",

@@ -66,13 +67,17 @@
“helmet”: “^7.1.0”,
“html-to-text”: “^9.0.5”,
“iconv-lite”: “^0.6.3”,

          "luxon": "^3.5.0",
          "module-alias": "^2.2.3",
          "moment": "^2.30.1",
          "node-ical": "0.18.0",

          "onoff": "^6.0.3",
          "pm2": "^5.4.2",

          "rss-parser": "^3.13.0",
          "socket.io": "^4.8.0",
          "suncalc": "^1.9.0",

          "systeminformation": "^5.23.5"

          "systeminformation": "^5.23.5",

          "wiring-pi": "^2.2.1"
  },
  "devDependencies": {
          "@eslint/js": "^9.11.1",

jefftse

@BKeyport

jeff@raspberrypi:~/MagicMirror $ rm package-lock.json
jeff@raspberrypi:~/MagicMirror $ git pull && npm run install-mm
Updating 94c3c69…c24de64
error: Your local changes to the following files would be overwritten by merge:
package.json
Please commit your changes or stash them before you merge.
Aborting

sdetweil

@jefftse

cd ~/MagicMirror 
git checkout package.json
git pull

if that is successful

npm run mm-install

but watch out, then sudo may have messed things uo

jefftse

@sdetweil

jeff@raspberrypi:~/MagicMirror $ npm run mm-install
npm ERR! Missing script: “mm-install”
npm ERR!
npm ERR! Did you mean one of these?
npm ERR! npm install # Install a package
npm ERR! npm uninstall # Remove a package
npm ERR!
npm ERR! To see a list of scripts, run:
npm ERR! npm run

npm ERR! A complete log of this run can be found in: /home/jeff/.npm/_logs/2025-01-03T16_14_57_938Z-debug-0.log
jeff@raspberrypi:~/MagicMirror $

sdetweil

@jefftse nano package.json
version should be 2.30.0

"name": "magicmirror",
	"version": "2.30.0"

jefftse

@sdetweil

i’m confused. it is showing “2.30.0”

sdetweil

@jefftse and further down

"scripts": {
		"config:check": "node js/check_config.js",
		"install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier",
		"install-mm": "npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev",
		"install-mm:dev": "npm install --no-audit --no-fund --no-update-notifier",
		"install-vendor": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier",

doah… my mistake…

npm run install-mm

jefftse

@sdetweil

That’s exactly what I have

jefftse

@sdetweil

jeff@raspberrypi:~/MagicMirror $ git checkout package.json
Updated 0 paths from the index

jefftse

@sdetweil

jeff@raspberrypi:~/MagicMirror $ git pull && npm run install-mm
Already up to date.

magicmirror@2.30.0 install-mm
npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev

npm ERR! code EBADENGINE
npm ERR! engine Unsupported engine
npm ERR! engine Not compatible with your version of node/npm: magicmirror@2.30.0
npm ERR! notsup Not compatible with your version of node/npm: magicmirror@2.30.0
npm ERR! notsup Required: {“node”:“>=20.18.1 <21 || >=22”}
npm ERR! notsup Actual: {“npm”:“10.1.0”,“node”:“v20.9.0”}

npm ERR! A complete log of this run can be found in: /home/jeff/.npm/_logs/2025-01-03T16_52_04_066Z-debug-0.log

sdetweil

@jefftse ok short path

sudo npm install n -g 
sudo n 20.18.1
cd ~/MagicMirror
npm run install-mm

jefftse

@sdetweil

I think that did the trick

sdetweil

@jefftse ok!!!