hhhhhhhhh

2023-10-22 00:05:55 +01:00 · 2023-10-22 00:05:55 +01:00 · 02982365e5
parent 13c92e75d1
commit 02982365e5
1 changed files with 1 additions and 1 deletions
--- a/.gitea/workflows/convert-to-yml.yml
+++ b/.gitea/workflows/convert-to-yml.yml
@ -41,7 +41,7 @@ jobs:
          git checkout ${{ env.PRODUCTION_BRANCH }}
          git pull
          git log -5
-          git merge master
+          git merge origin/master
          git push origin HEAD
      - name: make pull request
        run: |