more

2023-10-22 00:37:59 +01:00 · 2023-10-22 00:37:59 +01:00 · 32591f937a
parent 23b23432b5
commit 32591f937a
1 changed files with 1 additions and 1 deletions
--- a/.gitea/workflows/convert-to-yml.yml
+++ b/.gitea/workflows/convert-to-yml.yml
@ -35,7 +35,7 @@ jobs:
          git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
          git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }}
          git fetch
-          git merge origin/master --allow-unrelated-histories 
+          git merge origin/master --allow-unrelated-histories --strategy-option=ours
          git push origin HEAD:${{ env.PRODUCTION_BRANCH }}
      - name: make pull request
        run: |