From de45e6dce4b199b14e7ff874d153511c61e03182 Mon Sep 17 00:00:00 2001
From: zumbiepig <121742281+zumbiepig@users.noreply.github.com>
Date: Tue, 3 Sep 2024 15:23:39 -0700
Subject: [PATCH] Update compile-clients.yml

Signed-off-by: zumbiepig <121742281+zumbiepig@users.noreply.github.com>
---
 .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 6ba2a71..bb86d68 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 --rebase --allow-unrelated-histories main
+          git merge --allow-unrelated-histories ${{ steps.git-auto-commit-action.outputs.commit_hash }}
           git push origin dev