Aggregate & Push failed — 2026-07-08

[dnplkndll]

The aggregation workflow failed and requires manual attention.

Run: https://github.com/ledoent/fleet/actions/runs/28954657383

Last 30 lines of output:

From https://github.com/ledoent/fleet
 * branch                  feat/pg-compat-rebased -> FETCH_HEAD
 * [new branch]            feat/pg-compat-rebased -> fork/feat/pg-compat-rebased
From https://github.com/ledoent/fleet
 * branch                  ledoent    -> FETCH_HEAD
 * [new branch]            ledoent    -> fork/ledoent
From https://github.com/ledoent/fleet
 * branch                  patches/premium-license -> FETCH_HEAD
 * [new branch]            patches/premium-license -> fork/patches/premium-license
�[0m�[32m�[1m(INFO)�[0m [�[30m�[2m�[1m15:29:30�[39m�[0m] �[37m�[2m�[1mgit_aggregator.repo�[39m�[0m  �[34m�[2m�[1mfleet �[39m�[0m �[0m Checking repo status
�[0m�[32m�[1m(INFO)�[0m [�[30m�[2m�[1m15:29:30�[39m�[0m] �[37m�[2m�[1mgit_aggregator.repo�[39m�[0m  �[34m�[2m�[1mfleet �[39m�[0m �[0m Reset branch to fork feat/pg-compat-rebased
�[0m�[32m�[1m(INFO)�[0m [�[30m�[2m�[1m15:29:31�[39m�[0m] �[37m�[2m�[1mgit_aggregator.repo�[39m�[0m  �[34m�[2m�[1mfleet �[39m�[0m �[0m Pull fork, ledoent
Auto-merging .github/workflows/build-ledo.yml
CONFLICT (add/add): Merge conflict in .github/workflows/build-ledo.yml
Auto-merging docker-compose.yml
Automatic merge failed; fix conflicts and then commit the result.
�[0m�[31m�[1m(ERROR)�[0m [�[30m�[2m�[1m15:29:32�[39m�[0m] �[37m�[2m�[1mgit_aggregator.repo�[39m�[0m  �[34m�[2m�[1mfleet �[39m�[0m �[0m /home/runner/work/fleet/fleet/fleet> error calling ('git', 'pull', '--ff', '--no-rebase', '--no-edit', '--quiet', 'fork', 'ledoent')
Traceback (most recent call last):
  File "/home/runner/.local/lib/python3.12/site-packages/git_aggregator/main.py", line 230, in aggregate_repo
    repo.aggregate()
  File "/home/runner/.local/lib/python3.12/site-packages/git_aggregator/repo.py", line 189, in aggregate
    self._merge(merge)
  File "/home/runner/.local/lib/python3.12/site-packages/git_aggregator/repo.py", line 314, in _merge
    self.log_call(cmd, cwd=self.cwd)
  File "/home/runner/.local/lib/python3.12/site-packages/git_aggregator/repo.py", line 158, in log_call
    ret = callwith(cmd, **kw)
          ^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.12/subprocess.py", line 413, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '('git', 'pull', '--ff', '--no-rebase', '--no-edit', '--quiet', 'fork', 'ledoent')' returned non-zero exit status 1.