From 7f72b6e5f478799b0992087b406bd5f1e48a2c1f Mon Sep 17 00:00:00 2001
From: Cal <35017184+CallumWalley@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:45:50 +1300
Subject: [PATCH] Update fetch_includes.yml

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

diff --git a/.github/workflows/fetch_includes.yml b/.github/workflows/fetch_includes.yml
index c6bf44f1e..ab494b247 100644
--- a/.github/workflows/fetch_includes.yml
+++ b/.github/workflows/fetch_includes.yml
@@ -23,7 +23,7 @@ jobs:
       - run: | 
           git config --global user.name "${GITHUB_ACTOR}"
           git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-          # git config pull.rebase true
+          git config pull.ff only 
           git pull origin ${BRANCH_NAME} || git checkout -b ${BRANCH_NAME}
           git fetch
           git merge ${GITHUB_REF}