upgrading to latest MM version

[sdetweil]

@JMac did you put on the fix

see https://forum.magicmirror.builders/topic/19282/version-2-30-0-calendar-fix-for-clipping-broadcast-events

[JMac]

@sdetweil I hadn’t seen that, I was about to update the module individually then do some digging on here to see if others had had the issue.

do I use the list of commands in the link above, or the ones in this link?
https://forum.magicmirror.builders/topic/14327/testing-new-fixes-or-solving-current-problems-with-next-release-code

[JMac]

@sdetweil I’ve hit this at the 3 command,
MagicMirror@raspberrypi:~/MagicMirror $ git switch _fix_clipping
error: Your local changes to the following files would be overwritten by checkout:
package-lock.json
Please commit your changes or stash them before you switch branches.
Aborting

[sdetweil]

@JMac rm package-lock.json

[JMac]

@sdetweil do I run that in just the MagicMirror directory or the Calendar EXT3 module directory?

Below was your guidance from another of my topics with issues with this module, will it work?

(#)put package-lock.json back to last git clone state
git reset package-lock.json
(#) update the module
git pull
(#) rerun npm install with new code
npm install

had to put the # in () to stop the font going enormous

[sdetweil]

@JMac in the folder you are in!

[JMac]

@sdetweil
MagicMirror@raspberrypi:~/MagicMirror $ rm package-lock.json
rm: cannot remove ‘package-lock.json’: No such file or directory

guessing I’m not doing this right

[sdetweil]

@JMac but your prior message said

@sdetweil I’ve hit this at the 3 command,
MagicMirror@raspberrypi:~/MagicMirror $ git switch _fix_clipping
error: Your local changes to the following files would be overwritten by checkout:

package-lock.json

Please commit your changes or stash them before you switch branches.
Aborting

so it HAS to be there
ls and see if you see it
once you have it so it is NOT there
then do the switch again

[JMac]

@sdetweil
getting this now,
MagicMirror@raspberrypi:~/MagicMirror $ git switch _fix_clipping
Already on ‘_fix_clipping’

so assuming I can now restart mm?

[sdetweil]

@JMac correct, thats what the instructions say