can't update retropie : error running git pull returned 1

[darky2003]

while updating i get this error:
retropie error running git pull returned 1
looked in the log but i'm not skilled and can't see anything wrong.
heres the link to the log:
link text

Thx for helping,
grtz

[jonnykesh]

@darky2003

= = = = = = = = = = = = = = = = = = = = =
Running action 'install_theme' for 'esthemes' : Install themes for Emulation Station
= = = = = = = = = = = = = = = = = = = = =

From https://github.com/RetroPie/es-theme-carbon
   0237793..488ce79  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	custom-collections/art/system.svg
Please, commit your changes or stash them before you can merge.
Aborting
Updating 0237793..488ce79
Error running 'git pull' - returned 1
/home/pi

Your issue seems to be with the Carbon Theme. Uninstall it and then reinstall it if you wish. Then update again.

[mitu]

As @jonnykesh said, the problem is with the carbon theme, you probably replaced one of the files. You can ignore the error if you modified the file(s) yourself, otherwise you can follow @jonnykesh's advice and remove/install it again.

[grant2258]

execute a git stash

and itll work again

[darky2003]

Thx, got it fixed.
My retropie runs so much better (smoother) after updating!

[Clyde]

@darky2003 said in can't update retropie : error running git pull returned 1:

Thx, got it fixed.

How exactly? (for others with the same problem)

[darky2003]

@clyde
By going to the menu where u can download and install themes. Find the carbon theme (should say installed), nu pressing it , it will uninstall the themes. Reboot and try to update again.

[Clyde]

@darky2003 Thanks. :)