Updating problem: "commit your changes or stash them before you can merge" ???

[eniac]

Same Problem here, but only css/main.css is effected.
What can we do ?

[justjim1220]

@amanzimdwini @eniac

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]

git stash //stash your changes and save them
git pull //update to current version
git stash pop //merge your stash back

[justjim1220]

@yep_dd

Thanks! Wish I knew this before. Seems a lot easier than what I’ve been doing!!! :smirking_face:

[eniac]

Thanks … Work for me :-)