diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-08-13 16:46:32 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-08-13 16:46:32 +0000 |
| commit | 5b214af86b88d496c25fc229fb84b5d0db355fdd (patch) | |
| tree | 5398a92cc2e5d6b1d206033a5b6a9470fd4018c5 /Case_Of.txt | |
| parent | 2023-08-13T16:30:01Z (diff) | |
| download | repos-5b214af86b88d496c25fc229fb84b5d0db355fdd.tar.gz repos-5b214af86b88d496c25fc229fb84b5d0db355fdd.tar.bz2 repos-5b214af86b88d496c25fc229fb84b5d0db355fdd.zip | |
2023-08-13T16:45:01Z
Diffstat (limited to 'Case_Of.txt')
| -rw-r--r-- | Case_Of.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/Case_Of.txt b/Case_Of.txt index 41bb84c13bd1..2feb0e938756 100644 --- a/Case_Of.txt +++ b/Case_Of.txt @@ -14,9 +14,29 @@ pkgcore 0.12.21 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of *** syncing Case_Of -Already up to date. +From https://codeberg.org/Case_Of/gentoo-overlay + + 38dce97...1091900 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 Case_Of + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of +*** syncing Case_Of +Cloning into '/var/lib/repo-mirror-ci/sync/Case_Of'... *** synced Case_Of - * 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 Case_Of |