help with updating MM

sithas

noob question I’m tring to update my MM but I’m getting errors
error: Your local changes to the following files would be overwritten by merge:
modules/default/calendar/calendar.js
modules/default/currentweather/currentweather.js
modules/default/weatherforecast/weatherforecast.js
Please, commit your changes or stash them before you can merge.
Aborting
I’m not sure what if anything i changed so how can fix? also what is meant by slashing just putting / around the lines / ?

Mykle1

@sithas said in help with updating MM:

I’m not sure what if anything i changed so how can fix?

The error is telling you that you made changes to these three files:

modules/default/calendar/calendar.js
modules/default/currentweather/currentweather.js
modules/default/weatherforecast/weatherforecast.js

It is also telling you that your changes won’t be saved if you update, so it cancels the update. It’s likely that you changed some options in those files rather than making those changes in the config.js file. It is not recommended that you edit the module files for exactly this reason, unless you absolutely know what you are doing. Only change options in the config.js file.

Easiest fix:
Replace those files with their defaults and then run the update.

Snille

@sithas

Easiest fix:
Replace those files with their defaults and then run the update.

You can also “stash” your changes with git stash -u
Then if you want you can reapply your changes again after updating with git stash pop

Or, you can just “kill” the changes with git clean -f
But then you WILL loose what you have edited in the files for ever!

Mykle1

@Snille said in help with updating MM:

You can also “stash” your changes with git stash -u
Then if you want you can reapply your changes again after updating with git stash pop
Or, you can just “kill” the changes with git clean -f
But then you WILL loose what you have edited in the files for ever!

"I’m not sure what if anything i changed . . . "