Error updating to the latest version of Retroarch

TPR

I just got an error trying to update to the latest version of Retroarch from setup-script::

16 files changed, 551 insertions(+), 7 deletions(-)
rename android/{Sony_DualSense.cfg => DualSense Wireless Controller.cfg} (92%)
create mode 100644 dinput/Hyperkin Scout Premium Wireless BT.cfg
create mode 100644 dinput/Retro-Bit Saturn Bluetooth Controller.cfg
create mode 100644 hid/Atari VCS Classic Controller.cfg
create mode 100644 hid/Atari VCS Modern Controller.cfg
create mode 100644 linuxraw/Xbox Wireless Controller.cfg
rename sdl2/{PS4 Controller.cfg => PS4 Controller (v1).cfg} (96%)
create mode 100644 sdl2/Xbox Series X Controller.cfg
create mode 100644 udev/BETOP BETOP XF1 BFM DONGLE.cfg
create mode 100644 udev/Gamesir-T4 1.25.cfg
create mode 100644 udev/PowerA_Enhanced_Wired_Controller_For_Xbox_Series_X_S_Blue_Hint-xone.cfg
create mode 100644 udev/PowerA_Enhanced_Wired_Controller_For_Xbox_Series_X_S_Blue_Hint.cfg
HEAD is now in branch 'master' at commit 'b87111cd18c3c2ba8c8bb48e5ae69dbcd47b9547'
Copying new default configuration to /opt/retropie/configs/all/retroarch.cfg.rp-dist
Error running 'git pull --ff-only' - returned 1
/home/pi

Any ideas on what I need to do to fix that? My build did not load again when I restarted.

mitu

Please post the complete update log and add your system info, as requested in https://retropie.org.uk/forum/topic/3/read-this-first.
Use pastebin.com for the update log.

TPR

@mitu Here is the log:

https://pastebin.com/1VuTgrsb

I'm on a Pi 5 4gb board running all the latest updates up until this last one which wouldn't work.

mitu

The update actually worked, the error is thrown by the core info files update, which is done after the RetroArch binaries are created/updated.

You seem to have modified locally some of the .info files, that's what the error explicitely tells you:

....
M	yabause_libretro.info
Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
From https://github.com/libretro/libretro-core-info
   60d0347..8f34027  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	4do_libretro.info
	DoubleCherryGB_libretro.info
	chailove_libretro.info
	ep128emu_core_libretro.info
	fake08_libretro.info
	mame_libretro.info
	mamearcade_libretro.info
	mamemess_libretro.info
	melondsds_libretro.info
	mu_libretro.info
	px68k_libretro.info
	retro8_libretro.info
	swanstation_libretro.info
	vircon32_libretro.info
Please commit your changes or stash them before you merge.
Aborting
...

TPR

@mitu I don't think I have ever modified any .info files, or at least not on purpose. What can I do to fix this? Should I just delete all the .info files so it re-installs them?

mitu

@TPR said in Error updating to the latest version of Retroarch:

I don't think I have ever modified any .info files, or at least not on purpose.

Maybe not explicitely, but external scripts that you installed/run may have modified the files. I'm updating regularly using various configurations and there haven't been any issues like yours in the last year.

What can I do to fix this? Should I just delete all the .info files so it re-installs them?

You can delete the cores folder and it the .info files will be re-downloaded on future updates.

TPR

@mitu said in Error updating to the latest version of Retroarch:

You can delete the cores folder and it the .info files will be re-downloaded on future updates.

Awesome. Thank you!