Error running 'git pull --ff-only' - returned 1 Updating Retroarch

TPR

Trying to update RetroArch today and I'm getting the following error from RetroPie-Setup:
Error running 'git pull --ff-only' - returned 1

Here's the full log:
https://pastebin.com/nWp0KZvB

Any ideas how how to fix this error?

I have already tried this:

root@retropie:/home/pi/RetroPie-Setup# git pull
remote: Enumerating objects: 54, done.
remote: Counting objects: 100% (48/48), done.
remote: Compressing objects: 100% (20/20), done.
remote: Total 36 (delta 27), reused 22 (delta 16), pack-reused 0 (from 0)
Unpacking objects: 100% (36/36), 7.14 KiB | 347.00 KiB/s, done.
From https://github.com/RetroPie/RetroPie-Setup
cc5bfb49..1eb5b5fa master -> origin/master
Updating cc5bfb49..1eb5b5fa
Fast-forward
scriptmodules/emulators/ppsspp.sh | 11 ++++++++++-
scriptmodules/libretrocores/lr-flycast-dev.sh | 3 ++-
scriptmodules/libretrocores/lr-mupen64plus-next.sh | 18 ++++++++++++------
scriptmodules/ports/dsda-doom.sh | 2 +-
4 files changed, 25 insertions(+), 9 deletions(-)

And this:

root@retropie:/home/pi/RetroPie-Setup# git reset --hard
HEAD is now at 1eb5b5fa Merge pull request #4003 from joolswills/ppsspp_arm_on_aarch64_fix
root@retropie:/home/pi/RetroPie-Setup#

And still getting that error. Any thoughts?

mitu

You can actually see the error in the logs, you've modifed 2 shader files locally and they can't be updated:

...
Already on 'rpi'
....
Your branch is behind 'origin/rpi' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
error: Your local changes to the following files would be overwritten by merge:
	crt-yo6-KV-M1420B-fast.glslp
	shaders/barrel-distortion.glsl
Please commit your changes or stash them before you merge.
...

TPR

@mitu said in Error running 'git pull --ff-only' - returned 1 Updating Retroarch:

You can actually see the error in the logs, you've modifed 2 shader files locally and they can't be updated:

...
Already on 'rpi'
....
Your branch is behind 'origin/rpi' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
error: Your local changes to the following files would be overwritten by merge:
	crt-yo6-KV-M1420B-fast.glslp
	shaders/barrel-distortion.glsl
Please commit your changes or stash them before you merge.
...

Thank you for that! I never changed any of the shader files so I'm not sure how that happened and that's probably exactly why I missed it in the error log. But I appreciate you chasing that down and I'll go look for that and make the change right now!