hopefully this will sort it

2023-10-22 10:30:27 +01:00 · 2023-10-22 10:30:27 +01:00 · 78e6bbc80f
parent f4a11ec9cd
commit 78e6bbc80f
1 changed files with 1 additions and 1 deletions
--- a/.gitea/workflows/convert-to-yml.yml
+++ b/.gitea/workflows/convert-to-yml.yml
@ -33,7 +33,7 @@ jobs:
          git commit -m "${{ env.CI_COMMIT_MESSAGE }}
          
          converted from batch"
-          git merge origin/master --strategy-option=ours
+          git merge origin/master --strategy-option=ours --allow-unrelated
          git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}

      - name: GIT commit and push all changed files