Viewing 3 posts - 1 through 3 (of 3 total)
  • Author
    Posts
  • labelwhore
    Participant
    Post count: 526

    I wanted to update Emulation Station to the latest version to take advantage of some of the latest changes, but I’m stuck. I’m trying to update the retropie setuip script and keep running into an error that says the following:

    “error: Your local changes to the following files would be overwritten by merge..”

    it then goes on to list a bunch of files in the scriptmodules folder. Of course, I haven’t made any changes to any of those files. How can I get around this error?

    I’m too far into customizing my PI to start over with a fresh image, so that’s not an option at this point.

    gizmo98
    Participant
    Post count: 452

    You have modified RetroPie-Setup in any way. Try:
    sudo git stash
    sudo git pull
    sudo ./retropie-setup.sh

    It is also possible to clone RetroPie-Setup in any other directory with “git clone –depth=1 https://github.com/retropie/RetroPie-Setup.git”.

    labelwhore
    Participant
    Post count: 526

    Awesome, that worked. Thanks a lot!

Viewing 3 posts - 1 through 3 (of 3 total)
  • You must be logged in to reply to this topic.