error: Pulling is not possible because you have unmerged files.

sdetweil

@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

DazTypeR

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.

sdetweil

@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

DazTypeR

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?

sdetweil

@DazTypeR email to same userid as here on gmail