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