ohiseewhatyoumean

2023-10-21 23:35:48 +01:00 · 2023-10-21 23:35:48 +01:00 · 22d2e695fd
parent 8cce09e1e2
commit 22d2e695fd
1 changed files with 1 additions and 1 deletions
--- a/.gitea/workflows/convert-to-yml.yml
+++ b/.gitea/workflows/convert-to-yml.yml
@ -33,7 +33,7 @@ jobs:
          git checkout -b ${{ env.PRODUCTION_BRANCH }}
          git add -A
          git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
-          git merge origin master
+          git merge origin/master
          git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }}
      - name: make pull request
        run: |