From 158d85d821538a7ff6fc08aa21419df46808621c Mon Sep 17 00:00:00 2001
From: Cyanoure <kozelka.r@gmail.com>
Date: Sun, 15 Sep 2024 16:40:41 +0200
Subject: [PATCH] Actions: Redo merge command

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

diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index ecd30dd..7442593 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -32,7 +32,7 @@ jobs:
           BRANCH_NAME="${GITHUB_REF_NAME}-build"
           git fetch origin $BRANCH_NAME || true  # Allow failure if branch doesn't exist
           git switch $BRANCH_NAME || git switch -c $BRANCH_NAME
-          git merge --allow-unrelated-histories ${GITHUB_REF_NAME}
+          git merge --no-ff ${GITHUB_REF_NAME}
           rm -rf dist
 
       # Install dependencies