diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-18 05:06:05 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-18 05:06:05 +0000 |
| commit | 1024bfa6355f87026928af0410a4e3c629a21c09 (patch) | |
| tree | c91f7710d5f6503e9b286f46fafdb82a66872646 /CachyOS-kernels.txt | |
| parent | 2024-06-18T04:45:01Z (diff) | |
| download | repos-1024bfa6355f87026928af0410a4e3c629a21c09.tar.gz repos-1024bfa6355f87026928af0410a4e3c629a21c09.tar.bz2 repos-1024bfa6355f87026928af0410a4e3c629a21c09.zip | |
2024-06-18T05:00:01Z
Diffstat (limited to 'CachyOS-kernels.txt')
| -rw-r--r-- | CachyOS-kernels.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/CachyOS-kernels.txt b/CachyOS-kernels.txt index 78f21844023e..a2e0eb95962b 100644 --- a/CachyOS-kernels.txt +++ b/CachyOS-kernels.txt @@ -16,9 +16,29 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync CachyOS-kernels *** syncing CachyOS-kernels -Already up to date. +From https://github.com/Szowisz/CachyOS-kernels + + b2d23ce...50a4d84 main -> origin/main (forced update) +hint: You have divergent branches and need to specify how to reconcile them. +hint: You can do so by running one of the following commands sometime before +hint: your next pull: +hint: +hint: git config pull.rebase false # merge +hint: git config pull.rebase true # rebase +hint: git config pull.ff only # fast-forward only +hint: +hint: You can replace "git config" with "git config --global" to set a default +hint: preference for all repositories. You can also pass --rebase, --no-rebase, +hint: or --ff-only on the command line to override the configured default per +hint: invocation. +fatal: Need to specify how to reconcile divergent branches. +!!! failed syncing CachyOS-kernels + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync CachyOS-kernels +*** syncing CachyOS-kernels +Cloning into '/var/lib/repo-mirror-ci/sync/CachyOS-kernels'... *** synced CachyOS-kernels - * Sync succeeded + * Sync succeeded after re-adding $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 CachyOS-kernels |