From 65d6974a64588e4a2cb39f2411d9c1947cee7f84 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Sat, 20 Dec 2025 15:25:41 -0800
Subject: [PATCH] hfgdhfdgh

---
 .gitea/workflows/base-build.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index f0814cc..ccf93b3 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -224,7 +224,13 @@ jobs:
           if git status --porcelain | grep .; then
             git add **/*.tar.bz2 sha256sums.txt
             git commit -m "Update base images and checksum for ${{ matrix.version }} on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-            git push
+
+            # Fetch latest changes and rebase local commits on top
+            git pull --rebase origin main || true
+
+            # Push after rebase
+            git push origin main
+
             echo "archives_changed=true" >> $GITEA_OUTPUT
           else
             echo "[INFO] No changes to commit."