From 03f7cd83ce3bc5fe277429fbf73b24768a016de9 Mon Sep 17 00:00:00 2001 From: Isabel Fenton Date: Wed, 7 Aug 2024 10:38:39 +0100 Subject: [PATCH] fixing error with git pull --- .github/workflows/frontend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 8ec1d926..22bcd56f 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -11,7 +11,7 @@ jobs: ref: catalog-validation - name: Pull changes from main - run: git pull origin main + run: git config pull.rebase true - name: Install node uses: actions/setup-node@v4