diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-04-09 11:18:23 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-04-09 11:18:23 +0000 |
| commit | 86eb6ebb3e26cb4ccf6f8402b8e57c27664eda3e (patch) | |
| tree | 6eec77863d15f623a11d03ee7d69180145e96138 /bubba.txt | |
| parent | 2024-04-09T11:00:00Z (diff) | |
| download | repos-86eb6ebb3e26cb4ccf6f8402b8e57c27664eda3e.tar.gz repos-86eb6ebb3e26cb4ccf6f8402b8e57c27664eda3e.tar.bz2 repos-86eb6ebb3e26cb4ccf6f8402b8e57c27664eda3e.zip | |
2024-04-09T11:15:00Z
Diffstat (limited to 'bubba.txt')
| -rw-r--r-- | bubba.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bubba.txt b/bubba.txt index a34b753746aa..02ab2688859e 100644 --- a/bubba.txt +++ b/bubba.txt @@ -15,7 +15,7 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bubba *** syncing bubba From https://github.com/gordonb3/bubba-overlay - + aaa8a6e...daa22a4 master -> origin/master (forced update) + + daa22a4...bf8d427 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: |