added ours strategy option to merge

djeinstine · Nov 20, 2024 · 3e16636 · 3e16636
1 parent b75f50f
commit 3e16636
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/sync-dev.yml b/.github/workflows/sync-dev.yml
@@ -42,7 +42,7 @@ jobs:
           lines=$( git diff ${{env.SYNC_BRANCH}}..${{env.REPO_NAME}}/${{env.SYNC_BRANCH}} -- . ':(exclude).github/**' | wc -l )
           echo "Number of detected line changes: $lines"
           if [ $lines -gt 0 ]; then
-            git merge ${{env.REPO_NAME}}/${{env.SYNC_BRANCH}}
+            git merge --strategy-option ours ${{env.REPO_NAME}}/${{env.SYNC_BRANCH}}
             git push
           fi
         shell: bash