MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.

    Error with MM update

    Scheduled Pinned Locked Moved Troubleshooting
    5 Posts 3 Posters 2.7k Views 3 Watching
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • J Offline
      JoeFranz
      last edited by

      I have just tried mm to 2.1.3 to update, I get this error:

      pi@raspberrypi:~/MagicMirror $ git pull && npm install
      error: Your local changes to the following files would be overwritten by merge:
      modules/README.md
      Please, commit your changes or stash them before you can merge.
      Aborting
      pi@raspberrypi:~/MagicMirror $

      can someone help?

      randomnoiseR 1 Reply Last reply Reply Quote 0
      • randomnoiseR Offline
        randomnoise @JoeFranz
        last edited by randomnoise

        @JoeFranz I had same issue (except for me it was the calendar.js file it didnt like… this was because I had manually edited that file to apply hotfix for 24h times).

        You can run a git reset --hard which will ‘fix’ the readme.md file you must have edited… a word of warning though- this will also reset your custom.css (at least it seemed to for me) so make sure you take a copy 1st.

        1 Reply Last reply Reply Quote 0
        • Sandy2503S Offline
          Sandy2503
          last edited by

          i had the same.

          i have renamed the calendar.js to calendar.js.org in the folder modules/default/calendar and the update works very well …

          Sandy

          1 Reply Last reply Reply Quote 0
          • J Offline
            JoeFranz
            last edited by

            now I get at the end of this error message

            npm WARN stylelint-config-standard@16.0.0 requires a peer of stylelint@^7.8.0 but none was installed.
            pi@raspberrypi:~/MagicMirror $

            if I run mm now then I have only a black screen :-(

            1 Reply Last reply Reply Quote 0
            • J Offline
              JoeFranz
              last edited by

              I had probably killed something, now everything is running again.
              There is probably a problem with the calendar since the update. But I’m probably not alone …
              Thanks for the quick help!

              1 Reply Last reply Reply Quote 0

              Hello! It looks like you're interested in this conversation, but you don't have an account yet.

              Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.

              With your input, this post could be even better 💗

              Register Login
              • 1 / 1
              • First post
                Last post
              Enjoying MagicMirror? Please consider a donation!
              MagicMirror created by Michael Teeuw.
              Forum managed by Sam, technical setup by Karsten.
              This forum is using NodeBB as its core | Contributors
              Contact | Privacy Policy