From b2a25317cdf1e1c00f55e30469b3c7ab64e5b513 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Thu, 9 Oct 2025 16:04:37 +0200 Subject: [PATCH] rebase fix --- .github/workflows/charts-release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml index 62c59b5c49e..452397a1a1b 100644 --- a/.github/workflows/charts-release.yaml +++ b/.github/workflows/charts-release.yaml @@ -264,7 +264,8 @@ jobs: cd website git config user.name "TrueForge-Bot" git config user.email "bot@trueforge.org - + # Ensure we rebase in case there are changes from other sources in-between + git pull --rebase origin main git add . git diff-index --quiet HEAD || git commit -m "Update website with latest charts and docs" git push origin main