From 22d2e695fdc598fa7a7f7db7f969b5975b5dcbd1 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Sat, 21 Oct 2023 23:35:48 +0100
Subject: [PATCH] ohiseewhatyoumean

---
 .gitea/workflows/convert-to-yml.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml
index 732ae12..81ba4d1 100644
--- 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: |