diff options
Diffstat (limited to 'bratishkaerik-overlay.txt')
| -rw-r--r-- | bratishkaerik-overlay.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/bratishkaerik-overlay.txt b/bratishkaerik-overlay.txt index 1b2266cacd0e..16c4b20008cf 100644 --- a/bratishkaerik-overlay.txt +++ b/bratishkaerik-overlay.txt @@ -15,9 +15,29 @@ pkgcore 0.12.28 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bratishkaerik-overlay *** syncing bratishkaerik-overlay -Already up to date. +From https://git.sr.ht/~bratishkaerik/bratishkaerik-overlay + + d85d442...39c88ee 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 bratishkaerik-overlay + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bratishkaerik-overlay +*** syncing bratishkaerik-overlay +Cloning into '/var/lib/repo-mirror-ci/sync/bratishkaerik-overlay'... *** synced bratishkaerik-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 bratishkaerik-overlay |