kkk

2023-10-21 23:56:37 +01:00 · 2023-10-21 23:56:37 +01:00 · 58d5db9c83
parent 55a39c6132
commit 58d5db9c83
1 changed files with 7 additions and 1 deletions
--- 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: |