Updating problem: "commit your changes or stash them before you can merge" ???
amanzimdwini last edited by
SHOULD have been easy (and yes, I am patched / updated / upgraded / have node v10 etc)
pi@bathMM2:~/MagicMirror $ sudo git pull && npm install error: Your local changes to the following files would be overwritten by merge: .gitignore CHANGELOG.md Gruntfile.js README.md js/main.js js/module.js modules/default/alert/alert.js modules/default/calendar/README.md modules/default/calendar/calendar.js modules/default/calendar/calendarfetcher.js modules/default/compliments/README.md modules/default/compliments/compliments.js modules/default/currentweather/currentweather.js modules/default/newsfeed/README.md modules/default/newsfeed/fetcher.js modules/default/newsfeed/newsfeed.js modules/default/newsfeed/node_helper.js modules/default/weatherforecast/README.md modules/default/weatherforecast/weatherforecast.js package-lock.json package.json translations/de.json translations/en.json translations/it.json translations/nl.json translations/translations.js vendor/package-lock.json Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: translations/pt-br.json translations/zh-cn.json translations/zh-tw.json Please move or remove them before you can merge. Aborting
Interesting - but (a) what does it mean and (b) how do I proceed?
eniac last edited by
Same Problem here, but only css/main.css is effected.
What can we do ?
rename or delete them and try again
rename to save the changes you made
You can also rename the folder by adding _bak
or you can move those files out of their directories, like create a separate directory that has a different name than any other folder in MagicMirror.
yep_DD last edited by yep_DD
git stash //stash your changes and save them git pull //update to current version git stash pop //merge your stash back
Thanks! Wish I knew this before. Seems a lot easier than what I’ve been doing!!!
eniac last edited by
Thanks … Work for me