diff --git a/.forgejo/workflows/pull-upstream.yaml b/.forgejo/workflows/pull-upstream.yaml
index 37ccb382939..103c3050762 100644
--- a/.forgejo/workflows/pull-upstream.yaml
+++ b/.forgejo/workflows/pull-upstream.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Pull upstream
         run: |
           git remote add upstream https://github.com/void-linux/void-packages
-          git pull --rebase upstream master
+          git pull --rebase=merges upstream master
 
       - name: Commit
         if: ${{ steps.changed.outputs.all_changed_files != '' }}