From a3efa4e350df5f9e5f9ce735d0e1a95c4b71ba69 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 19 Aug 2025 10:54:10 +0200
Subject: [PATCH] Update push-to-gitea.yml

---
 .github/workflows/push-to-gitea.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-to-gitea.yml b/.github/workflows/push-to-gitea.yml
index 163ea035..c1fb72d5 100644
--- a/.github/workflows/push-to-gitea.yml
+++ b/.github/workflows/push-to-gitea.yml
@@ -27,7 +27,7 @@ jobs:
      - name: Pull Gitea changes
        run: |
          git fetch gitea
-         git rebase gitea/main
+         git merge --strategy=ours gitea/main
        env:
          GITEA_USER: ${{ secrets.GITEA_USERNAME }}
          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}