Cannot update origin/master error

[George Spiggott]

When I try to update in RetroPie I get the following error message.

From https://github.com/RetroPie/RetroPie- Setup d66cf370..e8251fdf master
origin/master error: Your local changes to the following files would be overwritten by the merger:
scriptmodules/helpers.sh
scriptmodules/packages.sh
please commit your changes or stash them before you merge.
Aborting

Can anyone give me some guidance?

Thanks

My specs

Pi Model or other hardware: Pi 4B 4GB overclocked to 2100 CPU / 850 GPU
Power Supply used: Official
RetroPie Version Used: 4.7.1 with the KMS driver
Built From: Pre made SD Image on RetroPie website
Controller used: PS3 Sixaxis (Bluetooth

[quicksilver]

@george-spiggott I believe you need to drop to the command line then navigate to the retropie setup directory and then do:

git reset --hard

Then relaunch emulation station and you should then be able to update.

[BuZz]

Before resetting you can do

git fetch origin
git diff origin/master

To see what's changed in your files. The error is because you have local changes, in case you want to keep them or reapply. It will also help to show if the changes are intentional or you have some filesystem corruption.

I suspect you have edited these files maybe?

[George Spiggott]

I may have modified something trying to get MESS to work for the Jaguar. Since I still can't get that to work it's no loss to revert to default.

It seems to be working just fine now.

Thanks

[George Spiggott]

Almost all updated overnight. I still seem to be having problems with MAME and MESS updating. Is this an upstream thing I should leave and come back to later?