Update failed: Would be overwritten by merge

[g0nz0uk]

Hello,

I haven't updated my image for a few months and have just tried and get this message below, would someone kindly enough advise on what steps I need to take here?

I'm on 4.3.3 (4 months old)

Then I get this

Thanks

[mitu]

@g0nz0uk said in Update failed: Would be overwritten by merge:

I haven't updated my image for a few months and have just tried and get this message below, would someone kindly enough advise on what steps I need to take here?

You probably edited the file referenced in the error screen (scriptmodules/emulators/atari800.sh). To get over this error, exit ES, enter the RetroPie-Setup folder and reset the file to its original content:

cd /home/pi/RetroPie-Setup
git reset --hard
# Start emulationstation again
emulationstation 

After getting back to ES, do the upgrade again.

[g0nz0uk]

@mitu many thanks, it's now updating to 4.3.15, appreciate your spent replying.