Update push-to-gitea.yml

2025-08-19 10:54:10 +02:00 · 2025-08-19 10:54:10 +02:00 · a3efa4e350
commit a3efa4e350
parent 563130ea85
1 changed files with 1 additions and 1 deletions
--- 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 }}