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.4k 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.
    • N Offline
      NoNameRo @Kristianson
      last edited by

      @Kristianson
      if you have the same error as @Bob

      have you deleted or renamed the readme file under “/home/pi/MagicMirror/modules/default/currentweather/README.md”

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

        Not exactly the same, that’s the problem it does not say what’s conflicting:

        pi@raspberrypi_7:~/MagicMirror $ sudo git pull && npm install
        error: Pulling is not possible because you have unmerged files.
        hint: Fix them up in the work tree, and then use 'git add/rm ’
        hint: as appropriate to mark resolution and make a commit.
        fatal: Exiting because of an unresolved conflict.
        pi@raspberrypi_7:~/MagicMirror $

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

          @Kristianson
          did you run git reset --hard and then git pull && npm install

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

            No, tried that and a bit more info:

            pi@raspberrypi_7:~/MagicMirror $ git reset
            Unstaged changes after reset:
            M .eslintrc.json
            M .travis.yml
            M CHANGELOG.md
            M README.md
            M installers/raspberry.sh
            M js/class.js
            M js/main.js
            M js/module.js
            M js/translator.js
            M modules/README.md
            M modules/default/alert/README.md
            M modules/default/calendar/README.md
            M modules/default/calendar/calendarfetcher.js
            M modules/default/calendar/vendor/ical.js/test/test.js
            M modules/default/compliments/README.md
            M modules/default/compliments/compliments.js
            M modules/default/currentweather/README.md
            M modules/default/currentweather/currentweather.js
            M modules/default/newsfeed/README.md
            M modules/default/newsfeed/fetcher.js
            M modules/default/newsfeed/newsfeed.js
            M modules/default/updatenotification/updatenotification.js
            M modules/default/weatherforecast/weatherforecast.js
            M package-lock.json
            M package.json
            M tests/configs/check_config.js
            D tests/unit/functions/class_spec.js
            M tests/unit/functions/cmp_versions_spec.js
            D tests/unit/translations/same_keys.js
            M translations/af.json
            M translations/bg.json
            M translations/ca.json
            M translations/cs.json
            M translations/cy.json
            M translations/da.json
            M translations/de.json
            M translations/en.json
            M translations/es.json
            M translations/et.json
            M translations/fi.json
            M translations/fr.json
            M translations/hu.json
            M translations/id.json
            M translations/is.json
            M translations/kr.json
            M translations/nb.json
            M translations/nl.json
            M translations/nn.json
            M translations/pl.json
            M translations/pt.json
            M translations/ro.json
            M translations/ru.json
            M translations/sv.json
            M translations/zh_cn.json
            pi@raspberrypi_7:~/MagicMirror $ git pull && npm install
            error: Your local changes to the following files would be overwritten by merge:
            .eslintrc.json
            .travis.yml
            CHANGELOG.md
            README.md
            installers/raspberry.sh
            js/class.js
            js/main.js
            js/module.js
            js/translator.js
            modules/README.md
            modules/default/alert/README.md
            modules/default/calendar/README.md
            modules/default/calendar/calendarfetcher.js
            modules/default/calendar/vendor/ical.js/test/test.js
            modules/default/compliments/README.md
            modules/default/compliments/compliments.js
            modules/default/currentweather/README.md
            modules/default/currentweather/currentweather.js
            modules/default/newsfeed/README.md
            modules/default/newsfeed/fetcher.js
            modules/default/newsfeed/newsfeed.js
            modules/default/updatenotification/updatenotification.js
            modules/default/weatherforecast/weatherforecast.js
            package-lock.json
            package.json
            tests/configs/check_config.js
            tests/unit/functions/cmp_versions_spec.js
            translations/af.json
            translations/bg.json
            translations/ca.json
            translations/cs.json
            translations/cy.json
            translations/da.json
            translations/de.json
            translations/en.json
            translations/es.json
            translations/et.json
            translations/fi.json
            translations/fr.json
            translations/hu.json
            translations/id.json
            translations/is.json
            translations/kr.json
            translations/nb.json
            translations/nl.json
            translations/nn.json
            translations/pl.json
            translations/pt.json
            translations/ro.json
            translations/ru.json
            translations/sv.json
            translations/zh_cn.json
            Please commit your changes or stash them before you merge.
            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 $

            Where are these files? Should I just remove them?

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

              @Kristianson
              Did you solve the problem, have you run

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