Merge 33f5b2c into 2eadaa0

jhudsl · May 16, 2022 · 9aec62f · 9aec62f
2 parents 2eadaa0 + 33f5b2c
commit 9aec62f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -100,7 +100,8 @@ jobs:
           branch_name='preview-${{ github.event.pull_request.number }}'
           git add --force check_reports/spell_check_results.tsv || echo "No changes to commit"
           git commit -m 'Add spell check file' || echo "No changes to commit"
-          git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours
+          git fetch
+          git merge -s recursive --strategy-option=theirs origin/${{ github.head_ref }} --allow-unrelated-histories
           git push --force origin $branch_name || echo "No changes to commit"
 
       - name: Build components of the spell check comment
@@ -210,8 +211,7 @@ jobs:
         git add --force check_reports/url_checks.tsv || echo "No changes to commit"
         git commit -m 'Add URL check file' || echo "No changes to commit"
         git fetch
-        git merge -s recursive --strategy-option=theirs origin/${{ github.head_ref }} --allow-unrelated-histories
-        git push --force origin $branch_name || echo "No changes to commit"
+        git push origin $branch_name || echo "No changes to commit"
 
     - name: Build components of the spell check comment
       id: build-components
@@ -299,7 +299,7 @@ jobs:
           branch_name='preview-${{ github.event.pull_request.number }}'
           git add --force question_error_report.tsv || echo "No changes to commit"
           git commit -m 'Add question error report file' || echo "No changes to commit"
-          git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours
+          git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=theirs
           git push origin $branch_name || echo "No changes to commit"
 
       - name: Build components of the quiz check comment
@@ -405,8 +405,8 @@ jobs:
           echo ::set-output name=changes::$changes
           git add . --force
           git commit -m 'Render preview' || echo "No changes to commit"
-          git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours
-          git push --force || echo "No changes to commit"
+          git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=theirs
+          git push origin $branch_name || echo "No changes to commit"
         shell: bash
 
       - name: Find Comment