diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index 731666a..8182084 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -36,12 +36,12 @@ jobs: git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }} git fetch git checkout master - git pull + git pull origin master git log -5 git checkout ${{ env.PRODUCTION_BRANCH }} - git pull + git pull origin ${{ env.PRODUCTION_BRANCH }} git log -5 - git merge origin/master + git merge master git push origin HEAD - name: make pull request run: |