@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!