MagicMirror Forum

    • Register
    • Login
    • Search
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • Donate
    • Discord
    1. Home
    2. DazTypeR
    3. Posts
    D
    • Profile
    • Following 0
    • Followers 0
    • Topics 1
    • Posts 19
    • Best 0
    • Controversial 0
    • Groups 0

    Posts made by DazTypeR

    • 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
    • 1
    • 2
    • 1 / 2