Cansavvy/merge conflict (#475)

* Try to fix merge conflict * fix merge * fix merge conflict problem * return to original strategy
jhudsl · Feb 16, 2022 · 34dc28a · 34dc28a
1 parent 7e94925
commit 34dc28a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -324,7 +324,7 @@ jobs:
           branch_name='preview-${{ github.event.pull_request.number }}'
           git fetch --all
           git checkout $branch_name
-          git merge -s recursive --strategy-option=ours origin/${{ github.head_ref }}
+          git merge -s recursive --strategy-option=theirs origin/${{ github.head_ref }}
         shell: bash
 
       # Run bookdown rendering