From 8cce09e1e2eb3583c9b13fc7f22fca386d60a325 Mon Sep 17 00:00:00 2001 From: giles Date: Sat, 21 Oct 2023 23:34:46 +0100 Subject: [PATCH] ohiseewhatyoumean --- .gitea/workflows/convert-to-yml.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index d472c23..732ae12 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -29,10 +29,11 @@ jobs: ls git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" + git config pull.rebase false git checkout -b ${{ env.PRODUCTION_BRANCH }} git add -A git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" - git pull origin master + git merge origin master git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }} - name: make pull request run: |