diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index 861d906..59e0e94 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -35,7 +35,13 @@ 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 + git checkout master + git pull + git log -5 + git checkout ${{ env.PRODUCTION_BRANCH }} + git pull + git log -5 + git merge master git push origin HEAD - name: make pull request run: |