diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-14 10:04:07 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-14 10:04:07 +0000 |
| commit | 9adf7a76fad0ad4d35c629edae685252cc0098af (patch) | |
| tree | 41d209d0a275c080c2f8e86509c7dfcd89301538 /qv2ray-overlay.txt | |
| parent | 2024-08-14T09:45:00Z (diff) | |
| download | repos-9adf7a76fad0ad4d35c629edae685252cc0098af.tar.gz repos-9adf7a76fad0ad4d35c629edae685252cc0098af.tar.bz2 repos-9adf7a76fad0ad4d35c629edae685252cc0098af.zip | |
2024-08-14T10:00:00Z
Diffstat (limited to 'qv2ray-overlay.txt')
| -rw-r--r-- | qv2ray-overlay.txt | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/qv2ray-overlay.txt b/qv2ray-overlay.txt index 83c017f4ea6a..2e268ba939b9 100644 --- a/qv2ray-overlay.txt +++ b/qv2ray-overlay.txt @@ -16,15 +16,28 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync qv2ray-overlay *** syncing qv2ray-overlay From https://github.com/blackteahamburger/qv2ray-overlay - 106d880..6f49b0c master -> origin/master -Updating 106d880..6f49b0c -Fast-forward - net-proxy/trojan-go-fork/Manifest | 4 ++-- - ...-go-fork-2024.08.04-r1.ebuild => trojan-go-fork-2024.08.11.ebuild} | 0 - 2 files changed, 2 insertions(+), 2 deletions(-) - rename net-proxy/trojan-go-fork/{trojan-go-fork-2024.08.04-r1.ebuild => trojan-go-fork-2024.08.11.ebuild} (100%) + + 6f49b0c...be22c27 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 qv2ray-overlay + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync qv2ray-overlay +*** syncing qv2ray-overlay +Cloning into '/var/lib/repo-mirror-ci/sync/qv2ray-overlay'... *** synced qv2ray-overlay - * 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 qv2ray-overlay |