diff options
author | 2024-09-11 17:50:59 +0000 | |
---|---|---|
committer | 2024-09-11 17:50:59 +0000 | |
commit | c877972efd24130435faa92991123ecb52886526 (patch) | |
tree | 4f30c2cd6d1b59f03689e558a9cb24bf9c15a3d5 /linux-surface.txt | |
parent | 2024-09-11T17:30:00Z (diff) | |
download | repos-c877972efd24130435faa92991123ecb52886526.tar.gz repos-c877972efd24130435faa92991123ecb52886526.tar.bz2 repos-c877972efd24130435faa92991123ecb52886526.zip |
2024-09-11T17:45:00Z
Diffstat (limited to 'linux-surface.txt')
-rw-r--r-- | linux-surface.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/linux-surface.txt b/linux-surface.txt index b0cd03f3ee51..c950425ca7e0 100644 --- a/linux-surface.txt +++ b/linux-surface.txt @@ -16,9 +16,29 @@ pkgcore 0.12.27 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync linux-surface *** syncing linux-surface -Already up to date. +From https://github.com/jasisonee/linux-surface-overlay + + fb58805...40eb2a3 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 linux-surface + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync linux-surface +*** syncing linux-surface +Cloning into '/var/lib/repo-mirror-ci/sync/linux-surface'... *** synced linux-surface - * 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 linux-surface |