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