• Recent
  • Tags
  • Popular
  • Home
  • Docs
  • Register
  • Login
RetroPie forum home
  • Recent
  • Tags
  • Popular
  • Home
  • Docs
  • Register
  • Login
Please do not post a support request without first reading and following the advice in https://retropie.org.uk/forum/topic/3/read-this-first

Unable to update Retropie

Scheduled Pinned Locked Moved Help and Support
updateretropie configerror message
5 Posts 2 Posters 1.4k Views
Loading More Posts
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • P
    p33te
    last edited by 10 Apr 2022, 15:55

    Its been a while since I have used my retropie powered PS1 so after getting it out for a tinker I went into retropie setup and hit update but I keep getting an error message:

    "error: Your local changes to the following files would be overwritten by merge:
    scriptmodules/emulators/atari800/sh

    please commit your changes or stack them before you merge."

    Does anyone show what I need to do to get around this? I haven't done anything with the atari emulator at all

    I am running a raspberry pi 3b+ with an official power supply, retropie v4.6 (built from Pre made SD Image on RetroPie website) and the usb devices connected are a ps1 to usb adapter and a Rii mini x1 keyboard

    M 1 Reply Last reply 10 Apr 2022, 16:09 Reply Quote 0
    • M
      mitu Global Moderator @p33te
      last edited by 10 Apr 2022, 16:09

      @p33te said in Unable to update Retropie:

      Does anyone show what I need to do to get around this? I haven't done anything with the atari emulator at all

      You've modified the file in question (atari800.sh), so the update would overwrite your local changes - that's what the error message tells you.

      You can remove the changes you've done by running, from the command line:

      cd $HOME/RetroPie-Setup
      git stash

      then start EmulationStation (by typing emulationstation) and try updating again.

      P 1 Reply Last reply 10 Apr 2022, 17:48 Reply Quote 0
      • P
        p33te @mitu
        last edited by 10 Apr 2022, 17:48

        @mitu That is not working.

        when I type git stash it get a message saying:

        ***please tell me who you are.

        Run

        git config --global user.email "you@example.com"
        git config -- glabal user.name "your name "

        to set your accounts default identity

        I have tired to set a username and email but I get an error message saying "error: invalid key: [my email address]"

        is there something I am missing, is there a default username/email address when retropie installs?

        M 1 Reply Last reply 10 Apr 2022, 17:50 Reply Quote 0
        • M
          mitu Global Moderator @p33te
          last edited by 10 Apr 2022, 17:50

          @p33te You don't need to set that, instead of stash you can use

          cd $HOME/RetroPie-Setup
          git reset --hard
          P 1 Reply Last reply 10 Apr 2022, 17:57 Reply Quote 0
          • P
            p33te @mitu
            last edited by p33te 4 Oct 2022, 18:57 10 Apr 2022, 17:57

            @mitu That did the trick, thanks for your help!

            1 Reply Last reply Reply Quote 0
            5 out of 5
            • First post
              5/5
              Last post

            Contributions to the project are always appreciated, so if you would like to support us with a donation you can do so here.

            Hosting provided by Mythic-Beasts. See the Hosting Information page for more information.

              This community forum collects and processes your personal information.
              consent.not_received