updating module not possible...need help

[Stoffbeuteluwe]

error: Your local changes to the following files would be overwritten by merge:
	.DS_Store
Please commit your changes or stash them before you merge.
Aborting

[Stoffbeuteluwe]

@sdetweil my solution is to delete the module folder and do a new install and that’s it

thanks to all

[sdetweil]

@Stoffbeuteluwe interesting
this on a Mac?

rm .DS_store

then git pull again

[Stoffbeuteluwe]

@sdetweil yes on a mac and on pi too

[sdetweil]

@Stoffbeuteluwe .DS_Store is a Mac file

I would guess it was added to the git repo accidentally

[BKeyport]

Alert the module author so they can work with you to determine if the file is in the repo and have it removed so it don’t cause issues.

[sdetweil]

@BKeyport it IS in the repo, else u wouldn’t get that error on pull

[BKeyport]

@sdetweil doh. you’re right. Silly me. ;)

[Assassins]

@Stoffbeuteluwe
I do this on my mac to pi : https://docs.magicmirror.builders/getting-started/upgrade-guide.html
and it work

[sdetweil]

@Assassins run my upgrade script

[Stoffbeuteluwe]

@sdetweil my solution is to delete the module folder and do a new install and that’s it

thanks to all