{'description': {'en': 'Miscellaneous Gentoo ebuilds'}, 'feed': ['https://github.com/bobwya/miscellaneous_ebuilds/commits/master.atom'], 'homepage': 'https://github.com/bobwya/miscellaneous_ebuilds', 'name': 'bobwya', 'owner': [{'email': 'bob.mt.wya@gmail.com', 'name': 'Bob Wya', 'type': 'person'}], 'quality': 'experimental', 'source': [{'type': 'git', 'uri': 'https://github.com/bobwya/miscellaneous_ebuilds.git'}, {'type': 'git', 'uri': 'git@github.com:bobwya/miscellaneous_ebuilds.git'}], 'status': 'unofficial'} pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bobwya *** syncing bobwya From https://github.com/bobwya/miscellaneous_ebuilds + 3728165d...d619b058 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 bobwya * Sync failed with 1 * Will try to re-create $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bobwya *** syncing bobwya Cloning into '/var/lib/repo-mirror-ci/sync/bobwya'... *** synced bobwya * 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 bobwya * Cache regenerated successfully