From 97ebd37c3bfd94cbea6eaeb933f0e7dcb4680b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hayreddin=20T=C3=BCzel?=
 <36648230+htuzel@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:36:42 +0100
Subject: [PATCH] feat: Improved ci workflows

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index db8c265..6f82d7b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,7 +47,7 @@ jobs:
         run: |
           git checkout master
           git pull
-          git merge origin/develop
+          git merge origin/develop --strategy-option theirs
           git push
 
       - name: Draft release