ohiseewhatyoumean

.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: |