Force to keep local version

ynput · Sep 20, 2024 · f5098e0 · f5098e0
1 parent 4f1b565
commit f5098e0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/release_trigger.yml b/.github/workflows/release_trigger.yml
@@ -212,7 +212,7 @@ jobs:
       - name: 🔀 Merge ${{ github.ref_name }} -> ${{ vars.MAIN_BRANCH }}
         run: |
           # git pull origin ${{ github.ref_name }} --no-rebase
-          git merge --no-ff origin/${{ github.ref_name }} -m "[Automated] Merged ${{ github.ref_name }} -> ${{ vars.MAIN_BRANCH }}"
+          git merge -X ours origin/${{ github.ref_name }} -m "[Automated] Merged ${{ github.ref_name }} -> ${{ vars.MAIN_BRANCH }}"
 
       # TODO implement this using gh command
       - name: 🔏 Push to protected ${{ vars.MAIN_BRANCH }} branch