update release workflow

LedgerHQ · Mar 19, 2024 · 20977aa · 20977aa
1 parent 445accc
commit 20977aa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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