• Recent
  • Tags
  • Unsolved
  • Solved
  • MagicMirror² Repository
  • Documentation
  • 3rd-Party-Modules
  • Donate
  • Discord
  • Register
  • Login
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: Pulling is not possible because you have unmerged files.

Scheduled Pinned Locked Moved Unsolved Troubleshooting
39 Posts 2 Posters 11.6k Views 2 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.
  • S Online
    sdetweil @DazTypeR
    last edited by Nov 2, 2019, 2:55 PM

    @DazTypeR well then

    so, when u run it it says

    It appears MagicMirror has not been installed on this system  
    please run the installer, "raspberry.sh" first  
    

    if so, rerun the script like this

    bash -c -x  "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)"
    

    Sam

    How to add modules

    learning how to use browser developers window for css changes

    1 Reply Last reply Reply Quote 0
    • D Offline
      DazTypeR
      last edited by Nov 2, 2019, 3:01 PM

      Hang on, I just ran this command…

      (curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)

      Should I have run this command…

      bash -c “$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)”

      No idea what the bash -c does?

      Would this have made a difference?

      S 1 Reply Last reply Nov 2, 2019, 3:04 PM Reply Quote 0
      • S Online
        sdetweil @DazTypeR
        last edited by Nov 2, 2019, 3:04 PM

        @DazTypeR yes… if you do it without bash -c, then it downloads the file, and throws it away

        if you do the bash -c, then it executes the script (single command -c)

        watch out for the double quotes… sometimes those turn into MS word document quotes, which linux shells don’t like

        Sam

        How to add modules

        learning how to use browser developers window for css changes

        1 Reply Last reply Reply Quote 0
        • D Offline
          DazTypeR
          last edited by Nov 2, 2019, 3:16 PM

          OK, so its official, I am a numpty :)

          This is what I get now when I run it…

          the log will be /home/pi/MagicMirror/installers/upgrade.log
          doing test run = true
          update log will be in /home/pi/MagicMirror/installers/upgrade.log

          saving custom.css
          upgrading from version 2.9.0 to 2.9.0
          fetching latest revisions
          bash: line 159: On branch master: command not found
          there are 28 local files that are different than the master repo

          .eslintrc.json
          .gitignore
          .travis.yml
          CHANGELOG.md
          LICENSE.md
          installers/raspberry.sh
          js/main.js
          modules/default/calendar/vendor/ical.js/node-ical.js
          modules/default/clock/clock.js
          modules/default/currentweather/currentweather.js
          modules/default/newsfeed/newsfeed.js
          modules/default/updatenotification/node_helper.js
          modules/default/updatenotification/updatenotification.js
          modules/default/weather/providers/darksky.js
          modules/default/weather/providers/openweathermap.js
          modules/default/weather/providers/ukmetoffice.js
          modules/default/weather/providers/weathergov.js
          modules/default/weather/weather.js
          modules/default/weather/weatherprovider.js
          modules/default/weatherforecast/weatherforecast.js
          package.json
          run-start.sh
          tests/e2e/vendor_spec.js
          translations/en.json
          translations/es.json
          translations/translations.js
          vendor/package-lock.json
          package-lock.json

          any *-lock.json files do not need to be saved
          do you want to save these files for later (Y/n)?n
          skipping restore for .eslintrc.json, doing test run
          skipping restore for .gitignore, doing test run
          skipping restore for .travis.yml, doing test run
          skipping restore for CHANGELOG.md, doing test run
          skipping restore for LICENSE.md, doing test run
          skipping restore for installers/raspberry.sh, doing test run
          skipping restore for js/main.js, doing test run
          skipping restore for modules/default/calendar/vendor/ical.js/node-ical.js, doing test run
          skipping restore for modules/default/clock/clock.js, doing test run
          skipping restore for modules/default/currentweather/currentweather.js, doing test run
          skipping restore for modules/default/newsfeed/newsfeed.js, doing test run
          skipping restore for modules/default/updatenotification/node_helper.js, doing test run
          skipping restore for modules/default/updatenotification/updatenotification.js, doing test run
          skipping restore for modules/default/weather/providers/darksky.js, doing test run
          skipping restore for modules/default/weather/providers/openweathermap.js, doing test run
          skipping restore for modules/default/weather/providers/ukmetoffice.js, doing test run
          skipping restore for modules/default/weather/providers/weathergov.js, doing test run
          skipping restore for modules/default/weather/weather.js, doing test run
          skipping restore for modules/default/weather/weatherprovider.js, doing test run
          skipping restore for modules/default/weatherforecast/weatherforecast.js, doing test run
          skipping restore for package.json, doing test run
          skipping restore for run-start.sh, doing test run
          skipping restore for tests/e2e/vendor_spec.js, doing test run
          skipping restore for translations/en.json, doing test run
          skipping restore for translations/es.json, doing test run
          skipping restore for translations/translations.js, doing test run
          skipping restore for vendor/package-lock.json, doing test run
          skipping restore for package-lock.json, doing test run
          processing dependency changes for active modules with package.json files

          processing for module MMM-GooglePhotos please wait

          skipped processing for MMM-GooglePhotos, doing test run
          processing complete for module MMM-GooglePhotos

          restoring custom.css

          It then put me back to the command line.

          S 1 Reply Last reply Nov 2, 2019, 3:35 PM Reply Quote 0
          • S Online
            sdetweil @DazTypeR
            last edited by Nov 2, 2019, 3:35 PM

            @DazTypeR cool,just like it should have… altho… line 159 bothers me

            can you run it again without apply, and use the debug flag

            bash -c -x "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)"
            

            you will have to scroll back up in the terminal window, but I’d like to see the few lines above/below the error line 159

            thx

            Sam

            How to add modules

            learning how to use browser developers window for css changes

            1 Reply Last reply Reply Quote 0
            • D Offline
              DazTypeR
              last edited by Nov 2, 2019, 3:41 PM

              Hope this has everything you need…

              • echo current branch = master
                ++ git status
              • ‘On branch master’ ‘Your branch and ‘'‘origin/master’'’ have diverged,’ ‘and have 4 and 76 different commits each, respectively.’ ’ (use “git pull” to merge the remote branch into yours)’ ‘You have unmerged paths.’ ’ (fix conflicts and run “git commit”)’ ’ (use “git merge --abort” to abort the merge)’ ‘Changes to be committed:’ ’ modified: .eslintrc.json’ ’ modified: .gitignore’ ’ modified: .travis.yml’ ’ modified: CHANGELOG.md’ ’ modified: LICENSE.md’ ’ deleted: css/custom.css’ ’ modified: installers/raspberry.sh’ ’ modified: js/main.js’ ’ modified: modules/default/calendar/vendor/ical.js/node-ical.js’ ’ modified: modules/default/clock/clock.js’ ’ modified: modules/default/currentweather/currentweather.js’ ’ modified: modules/default/newsfeed/newsfeed.js’ ’ modified: modules/default/updatenotification/node_helper.js’ ’ modified: modules/default/updatenotification/updatenotification.js’ ’ modified: modules/default/weather/providers/darksky.js’ ’ modified: modules/default/weather/providers/openweathermap.js’ ’ modified: modules/default/weather/providers/ukmetoffice.js’ ’ modified: modules/default/weather/providers/weathergov.js’ ’ modified: modules/default/weather/weather.js’ ’ modified: modules/default/weather/weatherprovider.js’ ’ modified: modules/default/weatherforecast/weatherforecast.js’ ’ modified: package.json’ ’ modified: run-start.sh’ ’ new file: tests/configs/modules/weather/currentweather_default.js’ ’ new file: tests/configs/modules/weather/currentweather_options.js’ ’ new file: tests/configs/modules/weather/currentweather_units.js’ ’ new file: tests/configs/modules/weather/forecastweather_default.js’ ’ new file: tests/configs/modules/weather/forecastweather_options.js’ ’ new file: tests/e2e/modules/mocks/index.js’ ’ new file: tests/e2e/modules/mocks/weather_current.js’ ’ new file: tests/e2e/modules/mocks/weather_forecast.js’ ’ new file: tests/e2e/modules/weather_spec.js’ ’ modified: tests/e2e/vendor_spec.js’ ’ new file: tests/node_modules/webdriverajaxstub/index.js’ ’ modified: translations/en.json’ ’ modified: translations/es.json’ ’ new file: translations/ms-my.json’ ’ modified: translations/translations.js’ ’ new file: untrack-css.sh’ ’ modified: vendor/package-lock.json’ ‘Unmerged paths:’ ’ (use “git add …” to mark resolution)’ ’ both modified: package-lock.json’ ‘Untracked files:’ ’ (use “git add …” to include in what will be committed)’ ’ css/save_custom.css’ ’ installers/dumpactivemodules.js’
                bash: line 159: On branch master: command not found
                ++ git status
                ++ grep modified
                ++ awk -F: ‘{print $2}’
              • diffs=’ .eslintrc.json
                .gitignore
                .travis.yml
                CHANGELOG.md
                LICENSE.md
                installers/raspberry.sh
                js/main.js
                modules/default/calendar/vendor/ical.js/node-ical.js
              S 1 Reply Last reply Nov 2, 2019, 3:50 PM Reply Quote 0
              • S Online
                sdetweil @DazTypeR
                last edited by Nov 2, 2019, 3:50 PM

                @DazTypeR cool, can u try that one more time (without apply) to see if I fixed the line 159 problem

                Sam

                How to add modules

                learning how to use browser developers window for css changes

                1 Reply Last reply Reply Quote 0
                • D Offline
                  DazTypeR
                  last edited by Nov 2, 2019, 3:53 PM

                  Just ran it again without the extra logging and a block of the output shows this…

                  saving custom.css
                  upgrading from version 2.9.0 to 2.9.0
                  fetching latest revisions
                  bash: line 159: On branch master: command not found
                  there are 28 local files that are different than the master repo

                  S 1 Reply Last reply Nov 2, 2019, 3:57 PM Reply Quote 0
                  • S Online
                    sdetweil @DazTypeR
                    last edited by Nov 2, 2019, 3:57 PM

                    @DazTypeR can I beg one more try?

                    Sam

                    How to add modules

                    learning how to use browser developers window for css changes

                    1 Reply Last reply Reply Quote 0
                    • D Offline
                      DazTypeR
                      last edited by Nov 2, 2019, 4:07 PM

                      saving custom.css
                      upgrading from version 2.9.0 to 2.9.0
                      fetching latest revisions
                      bash: line 154: [: missing `]’
                      MagicMirror git fetch failed
                      restoring custom.css

                      S 1 Reply Last reply Nov 2, 2019, 4:09 PM Reply Quote 0
                      • 1
                      • 2
                      • 3
                      • 4
                      • 2 / 4
                      2 / 4
                      • First post
                        19/39
                        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