From 32537eefb8da76f5e6af7ef438e7797f6f5449ba Mon Sep 17 00:00:00 2001
From: zumbiepig <121742281+zumbiepig@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:47:48 -0700
Subject: [PATCH] .

---
 .github/workflows/compile-clients.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/compile-clients.yml b/.github/workflows/compile-clients.yml
index f12c725..d40cd0b 100644
--- a/.github/workflows/compile-clients.yml
+++ b/.github/workflows/compile-clients.yml
@@ -52,5 +52,5 @@ jobs:
         if: steps.git-auto-commit-action.outputs.changes_detected == 'true'
         run: |
           git checkout dev
-          git merge --no-ff ${{ steps.git-auto-commit-action.outputs.commit_hash }}
+          git merge --rebase ${{ steps.git-auto-commit-action.outputs.commit_hash }}
           git push origin dev