Update of Retropie script failed

spud11

I'm trying to update the Retropie script in the usual way but receive the following error and I'm not sure how to correct it. Is anyone familiar with this error and knows how to get past it? Thanks:

"Update failed:

error: Your local changes to the following files would be overwritten by merge:
scriptmodules/emulators/atari800.sh
Please, commit your changes or stash them before you can merge.
Aborting"

I haven't made any manual changes to the scriptmodule for atari800.

mitu

@spud11 Somehow git detects a change made locally and refuses to merge the changes from the RetroPie repository. From the /home/pi/Retropie-Setup folder, you should execute (either exit ES or use SSH)

git reset --hard

Then try again the update.

hiulit

@mitu @spud11 It happened to me too and I think it was because of having @zerojay 's Retropie-Extra scriptmodules installed.
But I can't tell for sure if it was a clean install (of Retropie-Extra) or if I had modified some scriptsmodules.

mitu

@hiulit said in Update of Retropie script failed:

having @zerojay 's Retropie-Extra scriptmodules installed.

I don't think that's a problem. Most likely there was one of the scriptmodules included in the RetroPie-Setup.

spud11

@mitu @hiulit Thanks, mitu. That worked. Yes, in fact, hiulit, I had zerojay's experimental scripts installed as well and wondered whether it had had any effect. Anyway, after doing the reset, I noticed zerojay's scripts are still in setup.

hiulit

@spud11 Glad to hear that ;)

skj

@mitu said in Update of Retropie script failed:

@spud11 Somehow git detects a change made locally and refuses to merge the changes from the RetroPie repository. From the /home/pi/Retropie-Setup folder, you should execute (either exit ES or use SSH)
git reset --hard
Then try again the update.

im having the same issue but i dont understand how to do the git reset --hard
any help would be appreciated

mitu

@skj Exit Emulationstation, then - from the terminal - run the commands

cd RetroPie-Setup
git reset --hard

90sgamer

@spud11 How did you do it?

90sgamer

@mitu How to do it?

mitu

@90sgamer Please don't necro-post by replying to old topics, it's not good forum etiquette. If you have an problem, post it in a separate topic and add the info requested in https://retropie.org.uk/forum/topic/3/read-this-first.

LionSquall

@mitu thx for this, work perfect