v2.1.1 Update Error

[strawberry 3.141]

@bluecaka69 with my command you will loose your changes you can copy the files to a backup directory first

[bluecaka69]

@strawberry-3.141 so just make a copy of the config file. Run your command, then git pull && npm install. The transfer over my saved config??

[strawberry 3.141]

@bluecaka69 no those files which get complaint about modifications but you can save your config as well

[yawns]

@bluecaka69
No, not the config file. You changed things in clock.js and compliments.js and therefore git pull cannot update these files to be exactly like the updates ones in the repository.

[lucallmon]

@yawns so what do I do to get rid of the error then?

[mochman]

@lucallmon If you don’t care about the changes you made to those files then you can run
git stash from your MagicMirror directory. You should be able to run the git pull command after that.

If you want to keep them, I’d just copy those files to somewhere not in your MagicMirror directory, run the stash command, pull the new MM, and put them back if you think they aren’t going to break anything in 2.1.1

[lucallmon]

@strawberry-3.141 this worked! Thanks!