Module updates question

RonR

I have recently done 3 module updates and all of them threw an error when I did the ‘git pull’
Below is the output of the last upgrade. It indicates I have made changes to files I have never touched intentionally. I have done the “git stash” to clear the error and completed the upgrades. I went looking for a file that may give me an idea of what was changed. With my limited knowledge that led nowhere.

This is on MM 2.33 running in docker. It has happened on both my laptop and the RPI 5.

I appreciate any info someone has.
Thanks, Ron R

node@8ef60e7ba2e0:/opt/magic_mirror/modules/MMM-Config$ git pull
From https://github.com/sdetweil/MMM-Config
   c1b0dcb..65eb6cd  main       -> origin/main
Updating c1b0dcb..65eb6cd
error: Your local changes to the following files would be overwritten by merge:
	module_installer/install_module.cmd
Please commit your changes or stash them before you merge.
Aborting
node@8ef60e7ba2e0:/opt/magic_mirror/modules/MMM-Config$ git stash
Saved working directory and index state WIP on main: c1b0dcb fix linux builder for linked module folder
node@8ef60e7ba2e0:/opt/magic_mirror/modules/MMM-Config$ git pull
Updating c1b0dcb..65eb6cd
Fast-forward
 module_installer/install_module.cmd | 48 +++++++++++++++------
 module_installer/install_module.sh  | 86 ++++++++++++++++++++++---------------
 2 files changed, 86 insertions(+), 48 deletions(-)
node@8ef60e7ba2e0:/opt/magic_mirror/modules/MMM-Config$ exit
exit

sdetweil

@RonR hmm. I updated those to fix the install for missing dependencies. Don’t know why you have them out of sequence

Do

cd modules/MMM-Config

And

git checkout xxxx

For each of the files

Then

git pull

To resync the MMM-Config module

RonR

Ran git checkout on the one file listed in the error, “module_installer/install_module.cmd”. Results below. Then ran git pull again and it said everything was up to date.

Thanks for your help.

ron@ron-16-U:~/magicmirror/mounts/modules/MMM-Config/module_installer$ git checkout install_module.cmd
Updated 1 path from the index

sdetweil

@RonR weird.