updating without losing settings in config, and js files?

ninjabreadman

@navyvette87 @Cyberwrights is right, and where possible you should migrate your changes into config.js, custom.css, etc.

When updating, git insists that your files not have changes that conflict with those of the repository. Use git stash as outlined here to store your local changes, pull updates from the repo, then restore your own changes.

MichMich

Just curious, why would you modify any file other than the config.js and the custom.css file?

Nneuland

@navyvette87

I am not aware of how to implement “everything” into config.js.
Custom MMM-remotecontrol buttons, cache options, MMM-spotify buttons…

sdetweil

@Nneuland ALL module and MagicMirror config goes in config.js

the design is anything in config.js is used before the defaults from system and modules

ALL css goes in css/custom.css

anything in css/custom.css overrides anything specified by modules or system settings

IF you edit any other file, you risk blocking updates AND losing your changes when you force update

the override design means you never have your lose anything

this is why my upgrade script is 2 pass, to warn you of changes(that you may have forgotten) that WILL be lost.

Nneuland

Just to play devils advocate. Wouldn’t some modifications need to take place before electron launches?

I’d love to clean up my set up. is there any way to single out modified files that need to be implemented into config.js

sdetweil

@Nneuland no, we read config. js for electron options and
commandline switches too

to detect changes to base files, in each place (MagicMirror snd module folders ) do

git status

if there are modified files do

git diff filename
to see the actual changes

once you migrate those to config.js
git stash the changed files in that location

run MagicMirror and test that

then git stash pop
to restore from stash

the git checkout filename
to restore from the repository (hidden in .git folder)

repeat til no changed files and MagicMirror and modules run as expected

Nneuland

This is gold. Thank you Sam!