30b8f0d04d
All checks were successful
sync-to-forgejo / sync (push) Successful in 14s
Flux's ImageUpdateAutomation commits directly to Forgejo (the GitRepository it actually watches), so Forgejo routinely has commits GitHub never sees. The previous rebase-then-push assumed Forgejo was always a fast-forward of GitHub; once that stopped being true the rebase failed on every run and silently stalled all deploys for three days (fixed manually in the prior commit). Switch to a merge that favors GitHub's content on conflict (-X ours) and only pushes the merge commit to Forgejo, leaving GitHub's branch untouched. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| sync-to-forgejo.yml | ||