From cec6417f141e6250555bbb18996f6e8f54325a5f Mon Sep 17 00:00:00 2001
From: Sebastiaan de Schaetzen <sebastiaan.de.schaetzen@gmail.com>
Date: Wed, 23 Apr 2025 11:25:49 +0200
Subject: [PATCH] Use merge instead of rebase

---
 .gitea/workflows/workflow.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml
index 95c7e7f..ab4254c 100644
--- 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