diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-14 16:48:53 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-14 16:48:53 +0000 |
commit | a2e729c25cdbb23f942e13f7b35ea6f7a15df7c2 (patch) | |
tree | 6c318559b555d4467da3ab708878bf494572ac65 /lanodanOverlay.txt | |
parent | 2024-08-14T16:30:00Z (diff) | |
download | repos-a2e729c25cdbb23f942e13f7b35ea6f7a15df7c2.tar.gz repos-a2e729c25cdbb23f942e13f7b35ea6f7a15df7c2.tar.bz2 repos-a2e729c25cdbb23f942e13f7b35ea6f7a15df7c2.zip |
2024-08-14T16:45:00Z
Diffstat (limited to 'lanodanOverlay.txt')
-rw-r--r-- | lanodanOverlay.txt | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/lanodanOverlay.txt b/lanodanOverlay.txt index 4a82a5ed3757..fbb42965cf37 100644 --- a/lanodanOverlay.txt +++ b/lanodanOverlay.txt @@ -14,14 +14,28 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync lanodanOverlay *** syncing lanodanOverlay From https://hacktivis.me/git/overlay - e353bae..d16ae9b master -> origin/master -Updating e353bae..d16ae9b -Fast-forward - sys-devel/pnut/pnut-9999.ebuild | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - create mode 100644 sys-devel/pnut/pnut-9999.ebuild + + d16ae9b...16d8089 master -> origin/master (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 lanodanOverlay + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync lanodanOverlay +*** syncing lanodanOverlay +Cloning into '/var/lib/repo-mirror-ci/sync/lanodanOverlay'... *** synced lanodanOverlay - * Sync succeeded + * Sync succeeded after re-adding $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD error: gpg.ssh.allowedSignersFile needs to be configured and exist for ssh signature verification |