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.

    Problem updating to v2.3.1

    Scheduled Pinned Locked Moved Troubleshooting
    17 Posts 6 Posters 8.6k Views 6 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.
    • K Offline
      Kristianson
      last edited by

      Hi! Thank you for checking… I ran the git reset --hard and then the git pull && npm install but shorter error now… not sure if I should just remove the files? Never had this problem before:

      pi@raspberrypi_7:~/MagicMirror $ sudo git reset --hard
      HEAD is now at 532143c Merge pull request #1149 from bonaime/patch-1
      pi@raspberrypi_7:~/MagicMirror $ sudo git pull && npm install
      error: The following untracked working tree files would be overwritten by merge:
      dangerfile.js
      fonts/yarn.lock
      module-types.ts
      tests/configs/data/StripComments.json
      tests/configs/data/TranslationTest.json
      tests/configs/data/en.json
      tests/e2e/translations_spec.js
      tests/unit/classes/class_spec.js
      tests/unit/classes/deprecated_spec.js
      tests/unit/classes/translator_spec.js
      tests/unit/classes/utils_spec.js
      vendor/yarn.lock
      yarn.lock
      Please move or remove them before you merge.
      Aborting
      pi@raspberrypi_7:~/MagicMirror $

      N 1 Reply Last reply Reply Quote 0
      • B Offline
        Bob
        last edited by

        Not sure what I’ve done but when I run a git pull I now have a message that says I need to run “git commit -a” to fix the issues.

        What would happen if I did that ? Would it overwrite the main branch, or just create my own version of that branch ? I don’t have a git account, so would that cause issues as well ?

        C 1 Reply Last reply Reply Quote 0
        • N Offline
          NoNameRo @Kristianson
          last edited by

          @Kristianson
          move or remove the files below

          dangerfile.js
          fonts/yarn.lock
          module-types.ts
          tests/configs/data/StripComments.json
          tests/configs/data/TranslationTest.json
          tests/configs/data/en.json
          tests/e2e/translations_spec.js
          tests/unit/classes/class_spec.js
          tests/unit/classes/deprecated_spec.js
          tests/unit/classes/translator_spec.js
          tests/unit/classes/utils_spec.js
          vendor/yarn.lock
          yarn.lock
          

          and then run

          git pull && npm install
          
          1 Reply Last reply Reply Quote 0
          • K Offline
            Kristianson
            last edited by

            removed those and now:

            pi@raspberrypi_7:~/MagicMirror $ sudo git pull && npm install
            Removing tests/unit/translations/same_keys.js
            Removing tests/unit/functions/class_spec.js
            Auto-merging modules/default/currentweather/README.md
            CONFLICT (content): Merge conflict in modules/default/currentweather/README.md
            Automatic merge failed; fix conflicts and then commit the result.

            Perhaps I should just re-install it? I even removed the currentweather default module (directory and the files)…

            1 Reply Last reply Reply Quote 0
            • justjim1220J Offline
              justjim1220 Module Developer
              last edited by

              With any of the default modules… If you made any changes to the .js files or the README.md files, AND, you would like to keep those changes… TRY THIS:

              cut and paste any of the default modules from the MagicMirror directory to any other directory.
              You also need to do the same for the package.json, package-lock.json, and your config.js file if there are any additional modules that have been added.

              then do the ‘git pull $$ npm install’

              when it is done, replace those files in the new MagicMirror that just got installed with the ones you saved from your old MagicMirror.

              then do ‘npm rebuild’

              It took a couple of times starting the MagicMirror to get all the changes to take…

              this also fixes the currentweather module problem…

              and the blank screen problem…

              "Life's Too Short To Dance With Ugly People"
              Jim Hallock - 1995

              1 Reply Last reply Reply Quote 0
              • K Offline
                Kristianson
                last edited by

                Thank your for the reply. I will give that a try… failing that I am going to re-install it…

                1 Reply Last reply Reply Quote 0
                • B Offline
                  Bob
                  last edited by

                  Well, I couldn’t get it to work, so I just did a rebuild of the 2 mirrors. I keep a base build of the MM image anyway, so it only took an hour to recreate them both from scratch.

                  1 Reply Last reply Reply Quote 0
                  • K Offline
                    Kristianson
                    last edited by

                    So I reinstalled it, however now when the MagicMirror starts the screen is just black…

                    1 Reply Last reply Reply Quote 0
                    • C Offline
                      crowbar @Bob
                      last edited by

                      @Bob said in Problem updating to v2.3.1:

                      Not sure what I’ve done but when I run a git pull I now have a message that says I need to run “git commit -a” to fix the issues.

                      What would happen if I did that ? Would it overwrite the main branch, or just create my own version of that branch ? I don’t have a git account, so would that cause issues as well ?

                      I ran the “git commit -a”, exited that screen, then ran sudo git pull & npm install and it worked for me then…Had the same issues above before that

                      1 Reply Last reply Reply Quote 0
                      • 1
                      • 2
                      • 2 / 2
                      • 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