diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index f1d8a0e..ddcc618 100644 --- 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