Trouble updating...

[tguellich]

I am running an image I built myself via the directions, not downloaded from FreePlay.

I can't seem to update anything. The first thing I figure I need to tackle is the RetroPi Setup Script. I get the error...

Update failed:
From
https://github.com/retropie/retropie-setup
     d453cls..691b8b3    master     ->
origin/master
error: Your local changes to the
following files would be
overwritten by merge:
     .github/ISSUE_TEMPLATE.md
LATE.md
     Platforms.cfg
     scriptmodules/admin/buile
n/builder.sh
     scriptmodules/admin/image.
n/image.sh

Any ideas what is happening? I can't find much info online. Thanks for your time.