From 34dc28ac12c5b7ab6510360a75c3898cb4d59251 Mon Sep 17 00:00:00 2001
From: Candace Savonen <cansav09@gmail.com>
Date: Tue, 15 Feb 2022 20:05:00 -0500
Subject: [PATCH] Cansavvy/merge conflict (#475)

* Try to fix merge conflict

* fix merge

* fix merge conflict problem

* return to original strategy
---
 .github/workflows/pull_request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 46e27ace..5a980b03 100644
--- 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