<![CDATA[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.

]]>https://forum.magicmirror.builders/topic/11506/error-pulling-is-not-possible-because-you-have-unmerged-filesRSS for NodeSun, 09 Aug 2026 10:53:29 GMTSat, 02 Nov 2019 13:35:07 GMT60<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 17:29:59 GMT]]>@DazTypeR email to same userid as here on gmail

]]>https://forum.magicmirror.builders/post/63692https://forum.magicmirror.builders/post/63692Sat, 02 Nov 2019 17:29:59 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 17:29:20 GMT]]>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?

]]>https://forum.magicmirror.builders/post/63691https://forum.magicmirror.builders/post/63691Sat, 02 Nov 2019 17:29:20 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 17:23:55 GMT]]>@DazTypeR said in error: Pulling is not possible because you have unmerged files.:

doing test run = true

nothing changes in test_run mode

must use apply or force parms to get changes put on

code block,

paste text, select it all (pasted), then hit the </> button above the entry box

]]>https://forum.magicmirror.builders/post/63688https://forum.magicmirror.builders/post/63688Sat, 02 Nov 2019 17:23:55 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 17:14:58 GMT]]>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.

]]>https://forum.magicmirror.builders/post/63687https://forum.magicmirror.builders/post/63687Sat, 02 Nov 2019 17:14:58 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 17:03:36 GMT]]>@DazTypeR show me the ~/MagicMirror/installers/upgrade.log

if u can’t post (please use the markdown code block) email to me, same userid as here on gmail

]]>https://forum.magicmirror.builders/post/63685https://forum.magicmirror.builders/post/63685Sat, 02 Nov 2019 17:03:36 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 17:02:26 GMT]]>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?

]]>https://forum.magicmirror.builders/post/63684https://forum.magicmirror.builders/post/63684Sat, 02 Nov 2019 17:02:26 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 16:49:57 GMT]]>@DazTypeR change apply to force

this was in case u had some failure part way thru…and had to restart

]]>https://forum.magicmirror.builders/post/63681https://forum.magicmirror.builders/post/63681Sat, 02 Nov 2019 16:49:57 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 16:48:49 GMT]]>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.

]]>https://forum.magicmirror.builders/post/63680https://forum.magicmirror.builders/post/63680Sat, 02 Nov 2019 16:48:49 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 16:27:38 GMT]]>@DazTypeR yes, go ahead… good strategy. backup… never hurts…

thanks for all your help !!

my main computer boot drive is starting to fail…

time for a hard drive switch later today!

]]>https://forum.magicmirror.builders/post/63677https://forum.magicmirror.builders/post/63677Sat, 02 Nov 2019 16:27:38 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 16:25:47 GMT]]>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?

]]>https://forum.magicmirror.builders/post/63675https://forum.magicmirror.builders/post/63675Sat, 02 Nov 2019 16:25:47 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 16:22:59 GMT]]>@DazTypeR u should have seen a message

	any *-lock.json files do not need to be saved
]]>https://forum.magicmirror.builders/post/63673https://forum.magicmirror.builders/post/63673Sat, 02 Nov 2019 16:22:59 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 16:21:15 GMT]]>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?

]]>https://forum.magicmirror.builders/post/63672https://forum.magicmirror.builders/post/63672Sat, 02 Nov 2019 16:21:15 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 16:17:22 GMT]]>@DazTypeR ok, last time… hard to see the side effects

$(git status 2>&1) >>$logfile

that means execute the git status command , and THEN execute the results of THAT , and pass THOSE results to the log

what I wanted was

git status 2>&1 >>$logfile

exec the git status command, and pass ITS results to the log

]]>https://forum.magicmirror.builders/post/63671https://forum.magicmirror.builders/post/63671Sat, 02 Nov 2019 16:17:22 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 16:11:05 GMT]]>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

]]>https://forum.magicmirror.builders/post/63670https://forum.magicmirror.builders/post/63670Sat, 02 Nov 2019 16:11:05 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 16:09:28 GMT]]>@DazTypeR one last time

]]>https://forum.magicmirror.builders/post/63669https://forum.magicmirror.builders/post/63669Sat, 02 Nov 2019 16:09:28 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 16:07:39 GMT]]>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

]]>https://forum.magicmirror.builders/post/63668https://forum.magicmirror.builders/post/63668Sat, 02 Nov 2019 16:07:39 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 15:57:23 GMT]]>@DazTypeR can I beg one more try?

]]>https://forum.magicmirror.builders/post/63667https://forum.magicmirror.builders/post/63667Sat, 02 Nov 2019 15:57:23 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 15:53:44 GMT]]>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

]]>https://forum.magicmirror.builders/post/63666https://forum.magicmirror.builders/post/63666Sat, 02 Nov 2019 15:53:44 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 15:50:02 GMT]]>@DazTypeR cool, can u try that one more time (without apply) to see if I fixed the line 159 problem

]]>https://forum.magicmirror.builders/post/63665https://forum.magicmirror.builders/post/63665Sat, 02 Nov 2019 15:50:02 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 15:41:45 GMT]]>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
]]>https://forum.magicmirror.builders/post/63664https://forum.magicmirror.builders/post/63664Sat, 02 Nov 2019 15:41:45 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 15:35:45 GMT]]>@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

]]>https://forum.magicmirror.builders/post/63663https://forum.magicmirror.builders/post/63663Sat, 02 Nov 2019 15:35:45 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 15:16:35 GMT]]>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.

]]>https://forum.magicmirror.builders/post/63662https://forum.magicmirror.builders/post/63662Sat, 02 Nov 2019 15:16:35 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 15:04:23 GMT]]>@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

]]>https://forum.magicmirror.builders/post/63661https://forum.magicmirror.builders/post/63661Sat, 02 Nov 2019 15:04:23 GMT<![CDATA[Reply to error: Pulling is not possible because you have unmerged files. on Sat, 02 Nov 2019 15:01:59 GMT]]>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?

]]>https://forum.magicmirror.builders/post/63660https://forum.magicmirror.builders/post/63660Sat, 02 Nov 2019 15:01:59 GMT