| 1 |
Hello list, |
| 2 |
|
| 3 |
Today I get this: |
| 4 |
|
| 5 |
# emerge --sync |
| 6 |
>>> Syncing repository 'gentoo' into '/usr/portage'... |
| 7 |
/usr/bin/git pull |
| 8 |
remote: Counting objects: 25, done. |
| 9 |
remote: Compressing objects: 100% (9/9), done. |
| 10 |
remote: Total 25 (delta 15), reused 25 (delta 15), pack-reused 0 |
| 11 |
Unpacking objects: 100% (25/25), done. |
| 12 |
From https://github.com/gentoo-mirror/gentoo |
| 13 |
c80ef88a736..b9cb9e0b42e stable -> origin/stable |
| 14 |
Updating c5ec29f674c..b9cb9e0b42e |
| 15 |
error: Your local changes to the following files would be overwritten by |
| 16 |
merge: |
| 17 |
metadata/layout.conf |
| 18 |
Please commit your changes or stash them before you merge. |
| 19 |
Aborting |
| 20 |
!!! git pull error in /usr/portage |
| 21 |
|
| 22 |
I can't imagine I'd ever make any changes to that file, especially not using |
| 23 |
git, but I tried reverting to backups of /var and /usr/portage from a week |
| 24 |
ago, but I still get the same error. Using backups from two weeks ago also |
| 25 |
made no difference. |
| 26 |
|
| 27 |
I sync and update every day, with never a problem like this before. |
| 28 |
|
| 29 |
Can anyone see what else I should try? Should I just delete the offending |
| 30 |
file? (I'll get some coffee meanwhile...) |
| 31 |
|
| 32 |
-- |
| 33 |
Regards |
| 34 |
Peter |
Archives