diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index 31559b2..9450a31 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -34,6 +34,9 @@ jobs: git add -A 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 push origin HEAD:${{ env.PRODUCTION_BRANCH }} - name: make pull request run: | curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea