From e4e5700924cbd6bc6a168e8faf998483b68d5402 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Tue, 15 Feb 2022 19:51:09 -0500 Subject: [PATCH 1/4] Try to fix merge conflict --- .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 9014b830c..d1f3349f0 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -331,7 +331,7 @@ jobs: git add . || echo "no files to add" git commit -m "delete docs" || echo "no files to delete" - git merge -s recursive --strategy-option=theirs origin/${{ github.head_ref }} + git merge -s recursive --strategy-option=ours origin/${{ github.head_ref }} shell: bash # Run bookdown rendering From 5c704bcf01161b186c6d70f89347301f17dbc9c9 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Tue, 15 Feb 2022 19:52:48 -0500 Subject: [PATCH 2/4] fix merge --- .github/workflows/pull_request.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index d1f3349f0..46e27acee 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -324,13 +324,6 @@ jobs: branch_name='preview-${{ github.event.pull_request.number }}' git fetch --all git checkout $branch_name - - # Start fresh and delete these files - rm -rf docs/* || echo "no docs/ folder to delete" - rm -rf *.rds || echo "no RDS file to delete" - git add . || echo "no files to add" - git commit -m "delete docs" || echo "no files to delete" - git merge -s recursive --strategy-option=ours origin/${{ github.head_ref }} shell: bash From a3e45200367fedc5ee68512062ddf332da27c064 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Tue, 15 Feb 2022 20:02:29 -0500 Subject: [PATCH 3/4] fix merge conflict problem --- .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 46e27acee..5669459a7 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 -X theirs origin/${{ github.head_ref }} shell: bash # Run bookdown rendering From ad769e2d0f9b731335307a804977191c0a6eacc8 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Tue, 15 Feb 2022 20:03:08 -0500 Subject: [PATCH 4/4] 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 5669459a7..5a980b034 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 -X theirs origin/${{ github.head_ref }} + git merge -s recursive --strategy-option=theirs origin/${{ github.head_ref }} shell: bash # Run bookdown rendering