abendbrot can't be updated.

stefan-gr / abendbrot

Desktop oriented overlay for various ebuilds and the occasional gamer

19 stars 13 forks source link

abendbrot can't be updated. #96

Closed crocket closed 6 years ago

crocket commented 6 years ago

layman --sync-all fails because

 * Running Git... # ( cd /var/lib/layman/abendbrot  && /usr/bin/git pull )
Updating 3d57fc6..6fd2caf
error: Your local changes to the following files would be overwritten by merge:
        games-emulation/desmume-libretro/Manifest
Please commit your changes or stash them before you merge.
Aborting

crocket commented 6 years ago

Ouch, it turns out that the error was caused by my own modifications to /var/lib/layman/abendbrot. This problem is fixed.