From 587cad6d033a28b78095293856889bfe65fc6df8 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Tue, 31 Oct 2023 18:34:50 -0700 Subject: [PATCH] Update magic-modules.yml --- .github/workflows/magic-modules.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/magic-modules.yml b/.github/workflows/magic-modules.yml index 2dc60d2d617a..c98ba9046d8b 100644 --- a/.github/workflows/magic-modules.yml +++ b/.github/workflows/magic-modules.yml @@ -20,7 +20,9 @@ jobs: cd repo git config user.name "modular-magician" git config user.email "magic-modules@google.com" - git fetch origin ${{ github.base_ref }} # Fetch the base branch + git fetch origin ${{ + github.base_ref + }} # Fetch the base branch git merge --no-ff origin/${{ github.base_ref }} # Merge with the base branch yamlfiles=$(git diff --name-only origin/${{ github.base_ref