{'description': {'en': 'vGist overlay, for personal use.'}, 'feed': ['https://github.com/vgist/vgist-overlay/commits/master.atom'], 'homepage': 'https://github.com/vgist/vgist-overlay', 'name': 'vGist', 'owner': [{'email': 'admin@mail.havee.me', 'name': 'havee', 'type': 'person'}], 'quality': 'experimental', 'source': [{'type': 'git', 'uri': 'https://github.com/vgist/vgist-overlay.git'}, {'type': 'git', 'uri': 'git@github.com:vgist/vgist-overlay.git'}], 'status': 'official'} pkgcore 0.12.20 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist *** syncing vGist From https://github.com/vgist/vgist-overlay + 07d264c...066eb21 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 vGist * Sync failed with 1 * Will try to re-create $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist *** syncing vGist Cloning into '/var/lib/repo-mirror-ci/sync/vGist'... *** synced vGist * 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 vGist * Cache regenerated successfully