@sdetweil Sorry for the late response, That’s done the job.
If I get the package-lock.json during any other update, will this work to allow the update to continue?
Read the statement by Michael Teeuw here.
Posts
-
RE: MMM-carousel stuck with update
-
MMM-carousel stuck with update
I’m getting this error when running the latest update,
MagicMirror@raspberrypi:~/MagicMirror/modules/MMM-Carousel $ git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace “git config” with “git config --global” to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Updating fb51858…f14e5e9
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.
AbortingI’ve tried - git reset package-lock.json
as was recommended with a similar issue with MMM-CalendarEXT3 but this isn’t offering any steps forward.
Any thoughts?
Cheers. -
RE: upgrading to latest MM version
@sdetweil restarted the MM with PM2, still no info being displayed in the CalendarEXT3 module.
edit to add, after letting the mirror settle down, it’s now pulling the data
-
RE: upgrading to latest MM version
@sdetweil
getting this now,
MagicMirror@raspberrypi:~/MagicMirror $ git switch _fix_clipping
Already on ‘_fix_clipping’so assuming I can now restart mm?
-
RE: upgrading to latest MM version
@sdetweil
MagicMirror@raspberrypi:~/MagicMirror $ rm package-lock.json
rm: cannot remove ‘package-lock.json’: No such file or directoryguessing I’m not doing this right
-
RE: upgrading to latest MM version
@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 installhad to put the # in () to stop the font going enormous
-
RE: upgrading to latest MM version
@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 -
RE: upgrading to latest MM version
@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 -
RE: upgrading to latest MM version
@sdetweil This is useful to know.
Just add, I’ve had the same Issue as the last MM update, Calendar EXT3 is no longer pulling information from the base calendar module.
-
RE: upgrading to latest MM version
out of curiosity, what would I do if I needed to retrieve the back up, do I need a GitHub account?