From 0de2d1cce4f9804fbb536bc07559c797b1d972c4 Mon Sep 17 00:00:00 2001 From: "Calvin A. Allen" Date: Mon, 26 Jan 2026 10:47:49 -0500 Subject: [PATCH] fix(ci): rebase before pushing manifest changes --- .github/workflows/generate-manifests-from-r2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/generate-manifests-from-r2.yml b/.github/workflows/generate-manifests-from-r2.yml index 28fec57..78847c3 100644 --- a/.github/workflows/generate-manifests-from-r2.yml +++ b/.github/workflows/generate-manifests-from-r2.yml @@ -121,6 +121,7 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add src/internal/manifest/data/ git commit -m "chore(manifest): regenerate manifests from R2" + git pull --rebase origin main git push - name: Generate summary