From ca045fa5211ce52db73efd74921f7b97ddbd2e82 Mon Sep 17 00:00:00 2001 From: Dion van Velde Date: Wed, 15 Jan 2025 16:28:01 +0100 Subject: [PATCH] Update global-npm-resolve-conflicting-files-fix.yml --- .github/workflows/global-npm-resolve-conflicting-files-fix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/global-npm-resolve-conflicting-files-fix.yml b/.github/workflows/global-npm-resolve-conflicting-files-fix.yml index f7eb39fba..b05adffcf 100644 --- a/.github/workflows/global-npm-resolve-conflicting-files-fix.yml +++ b/.github/workflows/global-npm-resolve-conflicting-files-fix.yml @@ -29,7 +29,7 @@ jobs: run: | git fetch origin git checkout ${{ github.head_ref }} - git merge origin/master --strategy=ours --allow-unrelated-histories + git merge origin/master --strategy=theirs --allow-unrelated-histories - name: Resolve package-lock.json conflicts run: |