From 20977aa0695c1ab5f9b0b304a02ac9dc007cb2f7 Mon Sep 17 00:00:00 2001
From: Martin Cayuelas <martin.cayuelas@ledger.fr>
Date: Tue, 19 Mar 2024 12:06:00 +0100
Subject: [PATCH] update release workflow

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

diff --git a/.github/workflows/release-prepare.yml b/.github/workflows/release-prepare.yml
index 9d7d2182a29e..b8f8ddcaabe4 100644
--- a/.github/workflows/release-prepare.yml
+++ b/.github/workflows/release-prepare.yml
@@ -61,7 +61,7 @@ jobs:
       - name: merge into main
         run: |
           git checkout main
-          git merge ${{ inputs.ref }} --no-ff
+          git merge ${{ inputs.ref }} --no-ff --strategy-option theirs
           git push origin main
 
       - name: create PR to develop