Unable to update Retropie

[p33te]

Its been a while since I have used my retropie powered PS1 so after getting it out for a tinker I went into retropie setup and hit update but I keep getting an error message:

"error: Your local changes to the following files would be overwritten by merge:
scriptmodules/emulators/atari800/sh

please commit your changes or stack them before you merge."

Does anyone show what I need to do to get around this? I haven't done anything with the atari emulator at all

I am running a raspberry pi 3b+ with an official power supply, retropie v4.6 (built from Pre made SD Image on RetroPie website) and the usb devices connected are a ps1 to usb adapter and a Rii mini x1 keyboard

[mitu]

@p33te said in Unable to update Retropie:

Does anyone show what I need to do to get around this? I haven't done anything with the atari emulator at all

You've modified the file in question (atari800.sh), so the update would overwrite your local changes - that's what the error message tells you.

You can remove the changes you've done by running, from the command line:

cd $HOME/RetroPie-Setup
git stash

then start EmulationStation (by typing emulationstation) and try updating again.

[p33te]

@mitu That is not working.

when I type git stash it get a message saying:

***please tell me who you are.

Run

git config --global user.email "you@example.com"
git config -- glabal user.name "your name "

to set your accounts default identity

I have tired to set a username and email but I get an error message saying "error: invalid key: [my email address]"

is there something I am missing, is there a default username/email address when retropie installs?

[mitu]

@p33te You don't need to set that, instead of stash you can use

cd $HOME/RetroPie-Setup
git reset --hard

[p33te]

@mitu That did the trick, thanks for your help!