MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    1. Home
    2. DazTypeR
    3. Posts
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.
    D
    Offline
    • Profile
    • Following 0
    • Followers 0
    • Topics 1
    • Posts 19
    • Groups 0

    Posts

    Recent Best Controversial
    • RE: error: Pulling is not possible because you have unmerged files.

      HI matey, I ran this command…

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

      so not sure why it said test run = Y.

      My son has a swim gala now so got to shoot, I will get the contents of the log to you, do I just VI it or is there another way to get it to you?

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      Just VI it abd this is all that appeared on my screen…

      Upgrade started - Sat Nov 2 15:10:57 GMT 2019
      doing test run = true
      downloading dumpactivemodules script

      saving custom.css
      not english or locale not set, set git alias
      remote name = origin
      upgrading from version 2.9.0 to 2.9.0
      fetching latest revisions
      current branch = master
      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

      save/restore files selection = n
      “upgrade.log” 3423 lines, 162303 characters

      Not sure what you mean by markdown code block, sorry, like In say, still new to this.

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      OK done that, it ran, threw out no errors that I could see, so rebooted the Pi using sudo reboot and it all booted back up OK but the Magic Mirror still says there is an update?

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      OK, so I ran the script with the apply option and it said something about the versions are the same and just finished.

      Did all the test we do earlier pull down version 2.9.0 and that is what your installer is seeing?

      Just rebooted the Pi in case and when the Magic Mirror booted up it still said there was an update needed.

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      Of course, sorry, my bad, I did read that.

      So am I OK to run this now with the apply option and it should update me to 2.9.0?

      Also, on the slim chance this mucks up, I backed up my SD card prioe to doing all this, guess I will be OK to just reflash the card with that backup image?

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      OK nice one, that has come back with no errors or anything. :)

      Guessing I am correct in replying N to the question regarding lock.json files needed to be saved, I have no idea if I need them or not - lol?

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      Nearly…

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

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      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

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      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

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      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
      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      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.

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      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?

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      I can’t find an upgrade.log either in home or in the MagicMirror/installers folder.

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      It is called MagicMirror…

      pi@raspberrypi:~/MagicMirror

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      Yes I have a MagicMirror folder as I have managed to run my mirror for 10 months and have managed to do 2 upgrades in that time but in the past it has always told me what the error is and mostly how to fix it.

      With regards to posting the log, there is no upgrade.log file in that directory?

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      Sorry, probably didnt make myself clear.

      I knew the 1st script would not make any changes, how do i know the script worked and did not mess anything up?

      I dont see any messages output to the command line, it just finished.

      Sorry about my lack of understanding, I`m trying to learn as I go but its a long slog.

      This is the last thing it put out…

              fi
              # return to original folder
              cd - >/dev/null
              date +"Upgrade ended - %a %b %e %H:%M:%S %Z %Y" >>$logfile
      else
              echo It appears MagicMirror has not been installed on this system
              echo please run the installer, "raspberry.sh" first
      fi
      
      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      OK, so I ran the first script, how do i actually know if it worked?

      posted in Troubleshooting
      D
      DazTypeR
    • RE: error: Pulling is not possible because you have unmerged files.

      So i just CD into the MagicMirror directory and then run the top command, if that works, then run the 2nd?

      posted in Troubleshooting
      D
      DazTypeR
    • error: Pulling is not possible because you have unmerged files.

      Hi all,

      Trying to update Magic Mirror to the latest version after receiving a message on my mirror, I have always had issues updating the Mirror software but the messages provided to me in the past have always been helpful and I have manged to muddle my way through and get updated.

      Now after issuing git pull && npm install in the Magicmirror directory, all I get is the below…

      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.

      I have no idea what these can be, in the past I have always had issues with package lock json and vendor package lock json but the errors provided previously have always helped and offered explanations.

      I am running the stock mirror software with the Google Photos module added, can anybody help me to understand what the above message means and where I can fix it to enable me to update?

      Thank you in advance.

      posted in Troubleshooting
      D
      DazTypeR
    • 1 / 1