diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-26 11:18:57 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-26 11:18:57 +0000 |
| commit | 65e618c6d208a44be11ebb7b5aa7f14a24038451 (patch) | |
| tree | 3a504553c8e04d590ccd603823b304d457a98c17 /qv2ray-overlay.txt | |
| parent | 2024-08-26T11:00:00Z (diff) | |
| download | repos-65e618c6d208a44be11ebb7b5aa7f14a24038451.tar.gz repos-65e618c6d208a44be11ebb7b5aa7f14a24038451.tar.bz2 repos-65e618c6d208a44be11ebb7b5aa7f14a24038451.zip | |
2024-08-26T11:15:00Z
Diffstat (limited to 'qv2ray-overlay.txt')
| -rw-r--r-- | qv2ray-overlay.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/qv2ray-overlay.txt b/qv2ray-overlay.txt index e80e6fda9ba6..83e908994f5b 100644 --- a/qv2ray-overlay.txt +++ b/qv2ray-overlay.txt @@ -15,29 +15,9 @@ 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 - + 37796a7...cca0853 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'... +Already up to date. *** synced qv2ray-overlay - * Sync succeeded after re-adding + * Sync succeeded $ 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 |