Update global-npm-resolve-conflicting-files-fix.yml

qdraw · Jan 15, 2025 · ca045fa · ca045fa
1 parent ad1d31d
commit ca045fa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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: |