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 }}