MMM-ResRobot - Public transport information for Sweden

[sweup]

@sdetweil - I only got this

pi@raspberrypi:~ $ cd ~/MagicMirror/modules/MMM-ResRobot
pi@raspberrypi:~/MagicMirror/modules/MMM-ResRobot $ git pull
Updating 1618fcc..695f70d
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
pi@raspberrypi:~/MagicMirror/modules/MMM-ResRobot $ npm install
npm WARN npm npm does not support Node.js v10.21.0
npm WARN npm You should probably upgrade to a newer version of node as we
npm WARN npm can't make any promises that npm will work with this version.
npm WARN npm Supported releases of Node.js are the latest release of 4, 6, 7, 8, 9.
npm WARN npm You can find the latest version at https://nodejs.org/
up to date in 1.083s
pi@raspberrypi:~/MagicMirror/modules/MMM-ResRobot $ 

@Alvinger - I did a sudo reboot

[Alvinger]

@sweup it seems you have changed the file package.json

Stash it away with “git stash” and try the update again.

[sweup]

@Alvinger said in MMM-ResRobot - Public transport information for Sweden:

git stash

Like this?

cd ~/MagicMirror/modules/MMM-ResRobot
git stash
npm install

Edit:misspell

[Alvinger]

@sweup
git stash
git pull
npm install

[sweup]

@Alvinger - hmm something email adress. Any advice?

pi@raspberrypi:~ $ cd ~/MagicMirror/modules/MMM-ResRobot
pi@raspberrypi:~/MagicMirror/modules/MMM-ResRobot $ git stash

*** Please tell me who you are.

Run

  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got 'pi@raspberrypi.(none)')
Cannot save the current index state
pi@raspberrypi:~/MagicMirror/modules/MMM-ResRobot $ git pull
Updating 1618fcc..695f70d
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
pi@raspberrypi:~/MagicMirror/modules/MMM-ResRobot $ npm install
npm WARN npm npm does not support Node.js v10.21.0
npm WARN npm You should probably upgrade to a newer version of node as we
npm WARN npm can't make any promises that npm will work with this version.
npm WARN npm Supported releases of Node.js are the latest release of 4, 6, 7, 8, 9.
npm WARN npm You can find the latest version at https://nodejs.org/
up to date in 1.02s

[sdetweil]

@sweup let’s find out what u changed
do

git diff

[sweup]

@sdetweil - sry I’m a bit lost, do I do “git diff” after?

cd ~/MagicMirror/modules/MMM-ResRobot
git stash
git pull
npm install

[sdetweil]

@sweup git stash fails cause u are not registered to git on your machine
git pull fails cause it would overwrite a change u.made to package.json

so, I was trying to find out what the change was, and how important it is…

the other commands won’t work til we resolve the diff(erence) issue

[sweup]

@sdetweil @Alvinger - thx guys, after

$ git config --global user.email "you@example.com" 
$ git config --global user.name "Your Name"

I could solve it with git stash

[sdetweil]

@sweup yeh, but we don’t know what change u lost/stashed