From 806e8519d3d97c4c9402bde0457c338fb6373117 Mon Sep 17 00:00:00 2001
From: Arlind-dev <arlind@sulej.ch>
Date: Wed, 25 Jun 2025 14:58:56 +0200
Subject: [PATCH] oops

---
 .gitea/workflows/ci.yml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index ec16b62..c38f978 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -237,13 +237,6 @@ jobs:
         with:
           token: ${{ secrets.TOKEN }}
 
-      - id: download-updated-readme
-        name: Download README
-        uses: actions/download-artifact@v3
-        with:
-          name: updated-readme
-          path: .
-
       - id: configure-git
         name: Configure Git
         run: |
@@ -251,6 +244,23 @@ jobs:
           git config user.name "ci-bot"
           git config lfs.https://${{ vars.CONTAINER_REGISTRY }}/arlind/skins.git/info/lfs.locksverify true
 
+      - id: rebase-repository
+        name: Rebase Repository
+        run: |
+          git fetch origin main
+          git rebase origin/main || {
+            echo "⚠️ Git rebase failed, likely due to conflicts."
+            git rebase --abort || true
+            exit 1
+          }
+
+      - id: download-updated-readme
+        name: Download README
+        uses: actions/download-artifact@v3
+        with:
+          name: updated-readme
+          path: .
+
       - id: commit-and-push
         name: Commit and Push README
         run: |