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.

    Merge conflict detected in your package.json

    Scheduled Pinned Locked Moved Solved Troubleshooting
    19 Posts 3 Posters 3.1k 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.
    • G Offline
      Guku @sdetweil
      last edited by

      @sdetweil ran the command and this is it

      git checkout package.json
      Updated 1 path from the index

      sent email with upgrade log

      S 2 Replies Last reply Reply Quote 0
      • S Do not disturb
        sdetweil @Guku
        last edited by

        @Guku now

        cd ~/MagicMirror
        npm start 
        

        Sam

        How to add modules

        learning how to use browser developers window for css changes

        1 Reply Last reply Reply Quote 0
        • S Do not disturb
          sdetweil @Guku
          last edited by

          @Guku I ran upgarde on my very old desktop, 2.8 to 2.26
          all ok

          Sam

          How to add modules

          learning how to use browser developers window for css changes

          G 1 Reply Last reply Reply Quote 0
          • G Offline
            Guku @sdetweil
            last edited by

            @sdetweil now this

            npm run server

            magicmirror@2.26.0 server
            node ./serveronly

            [01.01.2024 13:52.17.327] [LOG] Starting MagicMirror: v2.26.0
            [01.01.2024 13:52.17.329] [LOG] Loading config …
            [01.01.2024 13:52.17.330] [DEBUG] config template file not exists, no envsubst
            [01.01.2024 13:52.17.332] [LOG] Loading module helpers …
            [01.01.2024 13:52.17.332] [LOG] No helper found for module: alert.
            [01.01.2024 13:52.17.336] [ERROR] Whoops! There was an uncaught exception…
            [01.01.2024 13:52.17.339] [ERROR] Error: Cannot find module ‘command-exists’
            Require stack:

            • /home/lolo/MagicMirror/modules/default/updatenotification/update_helper.js
            • /home/lolo/MagicMirror/modules/default/updatenotification/node_helper.js
            • /home/lolo/MagicMirror/js/app.js
            • /home/lolo/MagicMirror/serveronly/index.js
              at Module._resolveFilename (node:internal/modules/cjs/loader:1048:15)
              at Module._resolveFilename (/home/lolo/MagicMirror/node_modules/module-alias/index.js:49:29)
              at Module._load (node:internal/modules/cjs/loader:901:27)
              at Module.require (node:internal/modules/cjs/loader:1115:19)
              at require (node:internal/modules/helpers:130:18)
              at Object. (/home/lolo/MagicMirror/modules/default/updatenotification/update_helper.js:3:23)
              at Module._compile (node:internal/modules/cjs/loader:1241:14)
              at Module._extensions…js (node:internal/modules/cjs/loader:1295:10)
              at Module.load (node:internal/modules/cjs/loader:1091:32)
              at Module._load (node:internal/modules/cjs/loader:938:12)
              at Module.require (node:internal/modules/cjs/loader:1115:19)
              at require (node:internal/modules/helpers:130:18)
              at Object. (/home/lolo/MagicMirror/modules/default/updatenotification/node_helper.js:4:22)
              at Module._compile (node:internal/modules/cjs/loader:1241:14)
              at Module._extensions…js (node:internal/modules/cjs/loader:1295:10)
              at Module.load (node:internal/modules/cjs/loader:1091:32) {
              code: ‘MODULE_NOT_FOUND’,
              requireStack: [
              ‘/home/lolo/MagicMirror/modules/default/updatenotification/update_helper.js’,
              ‘/home/lolo/MagicMirror/modules/default/updatenotification/node_helper.js’,
              ‘/home/lolo/MagicMirror/js/app.js’,
              ‘/home/lolo/MagicMirror/serveronly/index.js’
              ]
              }
              [01.01.2024 13:52.17.339] [ERROR] MagicMirror² will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?
              [01.01.2024 13:52.17.339] [ERROR] If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues
            S 1 Reply Last reply Reply Quote 0
            • S Do not disturb
              sdetweil @Guku
              last edited by

              @Guku I’m guessing because of the merge conflict the install didn’t work

              do

              cd ~/MagicMirror
              npm install
              

              then start again

              Sam

              How to add modules

              learning how to use browser developers window for css changes

              G 1 Reply Last reply Reply Quote 0
              • G Offline
                Guku @sdetweil
                last edited by

                @sdetweil i think that finally did it!
                thank you so much for your help Sam!

                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