Use merge instead of rebase

2025-04-23 11:25:49 +02:00 · 2025-04-23 11:25:49 +02:00 · cec6417f14
commit cec6417f14
parent bc8dfc2e88
1 changed files with 3 additions and 3 deletions
--- a/.gitea/workflows/workflow.yml
+++ b/.gitea/workflows/workflow.yml
@ -22,11 +22,11 @@ jobs:
      - name: Fetch AUR
        run: git fetch aur
      
-      - name: Rebase current changes
-        run: git rebase aur/master
+      - name: Merge latest changes
+        run: git merge aur/master
      
      - name: Push changes (if any)
-        run: git push -f origin master
+        run: git push origin master
  
  wake:
    name: Wake Runner