I wanted to update Emulation Station to the latest version to take advantage of some of the latest changes, but I’m stuck. I’m trying to update the retropie setuip script and keep running into an error that says the following:
“error: Your local changes to the following files would be overwritten by merge..”
it then goes on to list a bunch of files in the scriptmodules folder. Of course, I haven’t made any changes to any of those files. How can I get around this error?
I’m too far into customizing my PI to start over with a fresh image, so that’s not an option at this point.