ohiseewhatyoumean

.gitea/workflows/build-develop-branch.yml

@@ -37,7 +37,7 @@ jobs:
           git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} ym files converted to xml"
           git push -f origin HEAD:${{ env.BUILD_BRANCH }}
 
-      - name: make pull request
+      - name: make pull request comment
         run: |
           curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
           chmod +x ./tea

.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
+          git push origin HEAD
       - name: make pull request
         run: |
           curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea