Using 'theirs' merging strategy for contributors script

harvard-edge · Dec 10, 2023 · 30f2f95 · 30f2f95
1 parent 04f6d97
commit 30f2f95
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/auto-add-contributors.yml b/.github/workflows/auto-add-contributors.yml
@@ -48,8 +48,7 @@ jobs:
         git config --global user.name "github-actions[bot]"
         
         # Fetch the latest state of the current branch from the remote
-        git fetch origin $GITHUB_REF_NAME
-        git merge origin/$GITHUB_REF_NAME
+        git pull -X theirs origin/$GITHUB_REF_NAME
         
         npx all-contributors generate