Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- * Syncing selected overlays,...
- * Running Git... # ( cd /var/lib/layman/pentoo && /usr/bin/git pull )
- remote: Counting objects: 46, done.
- remote: Compressing objects: 100% (22/22), done.
- remote: Total 46 (delta 30), reused 39 (delta 23), pack-reused 0
- Unpacking objects: 100% (46/46), done.
- From git://github.com/pentoo/pentoo-overlay
- 4841d15..5b888ef master -> origin/master
- Updating db3ff4c..5b888ef
- error: Your local changes to the following files would be overwritten by merge:
- scripts/pentoo-updater.sh
- Please commit your changes or stash them before you merge.
- Aborting
- * Failure result returned from Git
- *
- * Errors:
- * ------
- * Failed to sync overlay "pentoo".
- * Error was: Syncing overlay "pentoo" returned status 1!
- * db.sync()
- *
- * CLI: Errors occurred processing action sync_all
- *
- * Errors:
- * ------
- * Failed to sync overlay "pentoo".
- * Error was: Syncing overlay "pentoo" returned status 1!
- * db.sync()
- *
- * Spawn failed for: layman-sync, /etc/portage/postsync.d/layman-sync
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement