feat: Improved ci workflows

algolia · Dec 5, 2024 · 97ebd37 · 97ebd37
1 parent 9100ad4
commit 97ebd37
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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