From 67958e2358fe5ff18d49fc393fd19b82165f8283 Mon Sep 17 00:00:00 2001
From: Cal <35017184+CallumWalley@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:19:35 +1300
Subject: [PATCH] aaaaaa

Signed-off-by: Cal <35017184+CallumWalley@users.noreply.github.com>
---
 .github/workflows/fetch_includes.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/fetch_includes.yml b/.github/workflows/fetch_includes.yml
index 8ba319075..5038106a4 100644
--- a/.github/workflows/fetch_includes.yml
+++ b/.github/workflows/fetch_includes.yml
@@ -21,9 +21,8 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
           git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
           git config pull.rebase true
-          git pull origin main
-          git branch -D ${BRANCH_NAME} || true
-          git checkout -b ${BRANCH_NAME}
+          git pull origin ${BRANCH_NAME} || git checkout -b ${BRANCH_NAME}
+          git merge origin ${GITHUB_REF}
           mkdir -pv docs/assets/glossary
       - name: Module List
         run: |
@@ -43,10 +42,7 @@ jobs:
         run: |
             git fetch
             body_message="This Merge Request was triggered by an update to $(git diff --name-only ${GITHUB_REF} | tr '\n' ', ')."
-            git fetch
             if [[ $(git log ${GITHUB_REF}..HEAD) ]]; then
-                git rebase ${GITHUB_REF}
-                git pull origin ${GITHUB_REF}
                 git push origin ${BRANCH_NAME}
                 gh pr create -B ${GITHUB_REF} -H ${BRANCH_NAME} --title "Automatic Asset Update - $(date +'%Y-%m-%d')" --body "${body_message}" -l auto_merge
                 gh workflow run -R nesi/support-docs -r assets-update -f fileList=" " checks.yml