From 0a42bed955463b0dc98f0322f7ac19892a197465 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Tue, 21 May 2024 22:39:30 +0200 Subject: [PATCH] Update .forgejo/workflows/pull-upstream.yaml --- .forgejo/workflows/pull-upstream.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 != '' }}