diff options
author | 2024-08-17 06:33:56 +0000 | |
---|---|---|
committer | 2024-08-17 06:33:56 +0000 | |
commit | ebbbef89222d1e27f9981b6001cbfce4ab08733f (patch) | |
tree | 731485c823565a5388b1d69c373ecaae12c9a607 /icinga.txt | |
parent | 2024-08-17T06:15:00Z (diff) | |
download | repos-ebbbef89222d1e27f9981b6001cbfce4ab08733f.tar.gz repos-ebbbef89222d1e27f9981b6001cbfce4ab08733f.tar.bz2 repos-ebbbef89222d1e27f9981b6001cbfce4ab08733f.zip |
2024-08-17T06:30:00Z
Diffstat (limited to 'icinga.txt')
-rw-r--r-- | icinga.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/icinga.txt b/icinga.txt index cd3f275b2b4b..f4651b4afd4e 100644 --- a/icinga.txt +++ b/icinga.txt @@ -14,9 +14,29 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync icinga *** syncing icinga -Already up to date. +From https://github.com/antonfischl1980/icinga + + 000d897...32706a2 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 icinga + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync icinga +*** syncing icinga +Cloning into '/var/lib/repo-mirror-ci/sync/icinga'... *** synced icinga - * 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 icinga |