diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index 732ae12..81ba4d1 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -33,7 +33,7 @@ jobs: git checkout -b ${{ env.PRODUCTION_BRANCH }} git add -A git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" - git merge origin master + git merge origin/master git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }} - name: make pull request run: |