Can't update RetroPie-Setup

[SeraphisCain]

I get the following error:

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 merge.
Aborting

I assume this isn't something on my end, but just to confirm, does anyone know what's going on here?

[quicksilver]

@SeraphisCain see here:

https://retropie.org.uk/forum/topic/19428/update-of-retropie-script-failed/2

[SeraphisCain]

@quicksilver Thank you, that worked!

[ByteThis]

@SeraphisCain Sometimes it happens if you are running a third party image.

[Gwyllion]

Execute git reset --hard from /home/pi/Retropie-Setup (cd /home/pi/RetroPie-Setup) now you can make the script updated.

Cheers.

[SeraphisCain]

@ByteThis I'm running the official image.

[techrama]

user@host$ diskutil list
/dev/disk0 (internal, physical):
#: TYPE NAME SIZE IDENTIFIER
0: GUID_partition_scheme *500.3 GB disk0
1: EFI EFI 209.7 MB disk0s1
https://freeaccountsonline.com/
2: Apple_CoreStorage Mac HD 499.4 GB disk0s2
3: Apple_Boot Recovery HD 650.0 MB disk0s3
/dev/disk1 (internal, virtual):
#: TYPE NAME SIZE IDENTIFIER
0: Apple_HFS Mac HD +499.0 GB disk1
Logical Volume on disk0s2
3BAC0F9E-19F8-4AAB-8752-6514B573B497
Unencrypted
/dev/disk2 (internal, physical):
#: TYPE NAME SIZE IDENTIFIER
0: FDisk_partition_scheme *15.9 GB disk2
1: Windows_FAT_16 boot 59.8 MB disk2s1
2: Linux 15.9 GB disk2s2
user@host$