From b2d3d94dad0c51982f45cceb1a4613e72686b04c Mon Sep 17 00:00:00 2001 From: Cal <35017184+CallumWalley@users.noreply.github.com> Date: Fri, 11 Oct 2024 16:24:57 +1300 Subject: [PATCH] Update fetch_includes.yml Signed-off-by: Cal <35017184+CallumWalley@users.noreply.github.com> --- .github/workflows/fetch_includes.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fetch_includes.yml b/.github/workflows/fetch_includes.yml index b04e2441d..c94121b69 100644 --- a/.github/workflows/fetch_includes.yml +++ b/.github/workflows/fetch_includes.yml @@ -22,7 +22,8 @@ jobs: git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" # git config pull.rebase true git pull origin ${BRANCH_NAME} || git checkout -b ${BRANCH_NAME} - git merge origin/${GITHUB_REF} + git fetch + git merge ${GITHUB_REF} mkdir -pv docs/assets/glossary - name: Module List run: |