Merge 99e93d2 into 9146a96

jhudsl · Jun 15, 2022 · c25f15f · c25f15f
2 parents 9146a96 + 99e93d2
commit c25f15f
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -165,14 +165,21 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Configure git
+        run: |
+          git config --local user.email "itcrtrainingnetwork@gmail.com"
+          git config --local user.name "jhudsl-robot"
+
+          git checkout ${{ github.head_ref }}
+
       - name: Run styler
         run: Rscript -e "styler::style_file(list.files(pattern = 'Rmd$', recursive = TRUE, full.names = TRUE));warnings()"
 
       - name: Commit styled files
         run: |
           git add \*.Rmd
           git commit -m 'Style Rmds' || echo "No changes to commit"
-          git push origin || echo "No changes to commit"
+          git push || echo "No changes to commit"
 
   url-check:
     name: Check URLs
@@ -211,7 +218,8 @@ 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 push origin $branch_name || echo "No changes to commit"
+        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
       id: build-components
@@ -299,7 +307,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=theirs
+          git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours
           git push origin $branch_name || echo "No changes to commit"
 
       - name: Build components of the quiz check comment
@@ -405,8 +413,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=theirs
-          git push origin $branch_name || 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"
         shell: bash
 
       - name: Find Comment