<![CDATA[Problem updating to v2.3.1]]>Just tried to update today to v2.3.1 and got the following error when running “git pull” in the ~/MagicMirror directory

Removing tests/unit/translations/same_keys.js
Removing tests/unit/functions/class_spec.js
Auto-merging modules/default/currentweather/README.md
CONFLICT (content): Merge conflict in modules/default/currentweather/README.md
Automatic merge failed; fix conflicts and then commit the result.

Anyone got any ideas as to what I may be doing wrong ? (I’m running 2 mirrors, and both have the same error)

]]>https://forum.magicmirror.builders/topic/6906/problem-updating-to-v2-3-1RSS for NodeMon, 08 Jun 2026 14:41:58 GMTMon, 02 Apr 2018 18:40:50 GMT60<![CDATA[Reply to Problem updating to v2.3.1 on Sun, 15 Apr 2018 22:59:51 GMT]]>@Bob said in Problem updating to v2.3.1:

Not sure what I’ve done but when I run a git pull I now have a message that says I need to run “git commit -a” to fix the issues.

What would happen if I did that ? Would it overwrite the main branch, or just create my own version of that branch ? I don’t have a git account, so would that cause issues as well ?

I ran the “git commit -a”, exited that screen, then ran sudo git pull & npm install and it worked for me then…Had the same issues above before that

]]>https://forum.magicmirror.builders/post/38453https://forum.magicmirror.builders/post/38453Sun, 15 Apr 2018 22:59:51 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Mon, 09 Apr 2018 07:26:30 GMT]]>So I reinstalled it, however now when the MagicMirror starts the screen is just black…

]]>https://forum.magicmirror.builders/post/38176https://forum.magicmirror.builders/post/38176Mon, 09 Apr 2018 07:26:30 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Sat, 07 Apr 2018 07:29:49 GMT]]>Well, I couldn’t get it to work, so I just did a rebuild of the 2 mirrors. I keep a base build of the MM image anyway, so it only took an hour to recreate them both from scratch.

]]>https://forum.magicmirror.builders/post/38057https://forum.magicmirror.builders/post/38057Sat, 07 Apr 2018 07:29:49 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Thu, 05 Apr 2018 10:23:37 GMT]]>Thank your for the reply. I will give that a try… failing that I am going to re-install it…

]]>https://forum.magicmirror.builders/post/37978https://forum.magicmirror.builders/post/37978Thu, 05 Apr 2018 10:23:37 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Wed, 04 Apr 2018 20:55:44 GMT]]>With any of the default modules… If you made any changes to the .js files or the README.md files, AND, you would like to keep those changes… TRY THIS:

cut and paste any of the default modules from the MagicMirror directory to any other directory.
You also need to do the same for the package.json, package-lock.json, and your config.js file if there are any additional modules that have been added.

then do the ‘git pull $$ npm install’

when it is done, replace those files in the new MagicMirror that just got installed with the ones you saved from your old MagicMirror.

then do ‘npm rebuild’

It took a couple of times starting the MagicMirror to get all the changes to take…

this also fixes the currentweather module problem…

and the blank screen problem…

]]>https://forum.magicmirror.builders/post/37952https://forum.magicmirror.builders/post/37952Wed, 04 Apr 2018 20:55:44 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Wed, 04 Apr 2018 19:16:54 GMT]]>removed those and now:

pi@raspberrypi_7:~/MagicMirror $ sudo git pull && npm install
Removing tests/unit/translations/same_keys.js
Removing tests/unit/functions/class_spec.js
Auto-merging modules/default/currentweather/README.md
CONFLICT (content): Merge conflict in modules/default/currentweather/README.md
Automatic merge failed; fix conflicts and then commit the result.

Perhaps I should just re-install it? I even removed the currentweather default module (directory and the files)…

]]>https://forum.magicmirror.builders/post/37948https://forum.magicmirror.builders/post/37948Wed, 04 Apr 2018 19:16:54 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Wed, 04 Apr 2018 13:54:41 GMT]]>@Kristianson
move or remove the files below

dangerfile.js
fonts/yarn.lock
module-types.ts
tests/configs/data/StripComments.json
tests/configs/data/TranslationTest.json
tests/configs/data/en.json
tests/e2e/translations_spec.js
tests/unit/classes/class_spec.js
tests/unit/classes/deprecated_spec.js
tests/unit/classes/translator_spec.js
tests/unit/classes/utils_spec.js
vendor/yarn.lock
yarn.lock

and then run

git pull && npm install
]]>https://forum.magicmirror.builders/post/37937https://forum.magicmirror.builders/post/37937Wed, 04 Apr 2018 13:54:41 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Wed, 04 Apr 2018 08:25:27 GMT]]>Not sure what I’ve done but when I run a git pull I now have a message that says I need to run “git commit -a” to fix the issues.

What would happen if I did that ? Would it overwrite the main branch, or just create my own version of that branch ? I don’t have a git account, so would that cause issues as well ?

]]>https://forum.magicmirror.builders/post/37923https://forum.magicmirror.builders/post/37923Wed, 04 Apr 2018 08:25:27 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Wed, 04 Apr 2018 06:58:50 GMT]]>Hi! Thank you for checking… I ran the git reset --hard and then the git pull && npm install but shorter error now… not sure if I should just remove the files? Never had this problem before:

pi@raspberrypi_7:~/MagicMirror $ sudo git reset --hard
HEAD is now at 532143c Merge pull request #1149 from bonaime/patch-1
pi@raspberrypi_7:~/MagicMirror $ sudo git pull && npm install
error: The following untracked working tree files would be overwritten by merge:
dangerfile.js
fonts/yarn.lock
module-types.ts
tests/configs/data/StripComments.json
tests/configs/data/TranslationTest.json
tests/configs/data/en.json
tests/e2e/translations_spec.js
tests/unit/classes/class_spec.js
tests/unit/classes/deprecated_spec.js
tests/unit/classes/translator_spec.js
tests/unit/classes/utils_spec.js
vendor/yarn.lock
yarn.lock
Please move or remove them before you merge.
Aborting
pi@raspberrypi_7:~/MagicMirror $

]]>https://forum.magicmirror.builders/post/37922https://forum.magicmirror.builders/post/37922Wed, 04 Apr 2018 06:58:50 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Wed, 04 Apr 2018 03:16:22 GMT]]>@Kristianson
Did you solve the problem, have you run

git reset --hard
]]>https://forum.magicmirror.builders/post/37913https://forum.magicmirror.builders/post/37913Wed, 04 Apr 2018 03:16:22 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Tue, 03 Apr 2018 12:31:45 GMT]]>No, tried that and a bit more info:

pi@raspberrypi_7:~/MagicMirror $ git reset
Unstaged changes after reset:
M .eslintrc.json
M .travis.yml
M CHANGELOG.md
M README.md
M installers/raspberry.sh
M js/class.js
M js/main.js
M js/module.js
M js/translator.js
M modules/README.md
M modules/default/alert/README.md
M modules/default/calendar/README.md
M modules/default/calendar/calendarfetcher.js
M modules/default/calendar/vendor/ical.js/test/test.js
M modules/default/compliments/README.md
M modules/default/compliments/compliments.js
M modules/default/currentweather/README.md
M modules/default/currentweather/currentweather.js
M modules/default/newsfeed/README.md
M modules/default/newsfeed/fetcher.js
M modules/default/newsfeed/newsfeed.js
M modules/default/updatenotification/updatenotification.js
M modules/default/weatherforecast/weatherforecast.js
M package-lock.json
M package.json
M tests/configs/check_config.js
D tests/unit/functions/class_spec.js
M tests/unit/functions/cmp_versions_spec.js
D tests/unit/translations/same_keys.js
M translations/af.json
M translations/bg.json
M translations/ca.json
M translations/cs.json
M translations/cy.json
M translations/da.json
M translations/de.json
M translations/en.json
M translations/es.json
M translations/et.json
M translations/fi.json
M translations/fr.json
M translations/hu.json
M translations/id.json
M translations/is.json
M translations/kr.json
M translations/nb.json
M translations/nl.json
M translations/nn.json
M translations/pl.json
M translations/pt.json
M translations/ro.json
M translations/ru.json
M translations/sv.json
M translations/zh_cn.json
pi@raspberrypi_7:~/MagicMirror $ git pull && npm install
error: Your local changes to the following files would be overwritten by merge:
.eslintrc.json
.travis.yml
CHANGELOG.md
README.md
installers/raspberry.sh
js/class.js
js/main.js
js/module.js
js/translator.js
modules/README.md
modules/default/alert/README.md
modules/default/calendar/README.md
modules/default/calendar/calendarfetcher.js
modules/default/calendar/vendor/ical.js/test/test.js
modules/default/compliments/README.md
modules/default/compliments/compliments.js
modules/default/currentweather/README.md
modules/default/currentweather/currentweather.js
modules/default/newsfeed/README.md
modules/default/newsfeed/fetcher.js
modules/default/newsfeed/newsfeed.js
modules/default/updatenotification/updatenotification.js
modules/default/weatherforecast/weatherforecast.js
package-lock.json
package.json
tests/configs/check_config.js
tests/unit/functions/cmp_versions_spec.js
translations/af.json
translations/bg.json
translations/ca.json
translations/cs.json
translations/cy.json
translations/da.json
translations/de.json
translations/en.json
translations/es.json
translations/et.json
translations/fi.json
translations/fr.json
translations/hu.json
translations/id.json
translations/is.json
translations/kr.json
translations/nb.json
translations/nl.json
translations/nn.json
translations/pl.json
translations/pt.json
translations/ro.json
translations/ru.json
translations/sv.json
translations/zh_cn.json
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
dangerfile.js
fonts/yarn.lock
module-types.ts
tests/configs/data/StripComments.json
tests/configs/data/TranslationTest.json
tests/configs/data/en.json
tests/e2e/translations_spec.js
tests/unit/classes/class_spec.js
tests/unit/classes/deprecated_spec.js
tests/unit/classes/translator_spec.js
tests/unit/classes/utils_spec.js
vendor/yarn.lock
yarn.lock
Please move or remove them before you merge.
Aborting
pi@raspberrypi_7:~/MagicMirror $

Where are these files? Should I just remove them?

]]>https://forum.magicmirror.builders/post/37887https://forum.magicmirror.builders/post/37887Tue, 03 Apr 2018 12:31:45 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Tue, 03 Apr 2018 12:28:49 GMT]]>@Kristianson
did you run git reset --hard and then git pull && npm install

]]>https://forum.magicmirror.builders/post/37886https://forum.magicmirror.builders/post/37886Tue, 03 Apr 2018 12:28:49 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Tue, 03 Apr 2018 12:23:18 GMT]]>Not exactly the same, that’s the problem it does not say what’s conflicting:

pi@raspberrypi_7:~/MagicMirror $ sudo git pull && npm install
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.
pi@raspberrypi_7:~/MagicMirror $

]]>https://forum.magicmirror.builders/post/37885https://forum.magicmirror.builders/post/37885Tue, 03 Apr 2018 12:23:18 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Tue, 03 Apr 2018 12:20:46 GMT]]>@Kristianson
if you have the same error as @Bob

have you deleted or renamed the readme file under “/home/pi/MagicMirror/modules/default/currentweather/README.md”

]]>https://forum.magicmirror.builders/post/37884https://forum.magicmirror.builders/post/37884Tue, 03 Apr 2018 12:20:46 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Tue, 03 Apr 2018 12:08:57 GMT]]>get the same error when upgrading - I just did: git pull && npm install
how do I find what the conflicts are?

]]>https://forum.magicmirror.builders/post/37883https://forum.magicmirror.builders/post/37883Tue, 03 Apr 2018 12:08:57 GMT<![CDATA[Reply to Problem updating to v2.3.1 on Mon, 02 Apr 2018 19:35:39 GMT]]>I did not attempt to update, but you could try to delete/rename/move the file it could not merge and try again

]]>https://forum.magicmirror.builders/post/37845https://forum.magicmirror.builders/post/37845Mon, 02 Apr 2018 19:35:39 GMT