From cfe092be88c9d2f028721c88934ffa6d8002ac0f Mon Sep 17 00:00:00 2001 From: giles Date: Sun, 22 Oct 2023 00:06:51 +0100 Subject: [PATCH] llllllllllllllllll --- .gitea/workflows/convert-to-yml.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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: |