2022-05-11T21:30:01Z

1 files changed, 2 insertions, 22 deletions

diff --git a/palemoon.txt b/palemoon.txt
index f2a7e0b5ebdd..fa7c69b50250 100644
--- a/palemoon.txt
+++ b/palemoon.txt
@@ -13,29 +13,9 @@ pkgcore 0.12.10
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync palemoon
 *** syncing palemoon
-From https://github.com/deu/palemoon-overlay
- + 7cda7ef...19fd1e8 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 palemoon
- * Sync failed with 1
- * Will try to re-create
-$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync palemoon
-*** syncing palemoon
-Cloning into '/var/lib/repo-mirror-ci/sync/palemoon'...
+Already up to date.
 *** synced palemoon
- * 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 palemoon