diff --git a/.github/workflows/merge-check.yml b/.github/workflows/merge-check.yml index 7da69d75b44a2..73757d7dc6440 100644 --- a/.github/workflows/merge-check.yml +++ b/.github/workflows/merge-check.yml @@ -29,7 +29,7 @@ jobs: if [[ "${{ github.event_name }}" == "pull_request"* ]]; then git fetch origin ${{ github.event.pull_request.base.ref }}:base_branch git checkout base_branch - git pull origin pull/${{ github.event.pull_request.number }}/head + git pull --rebase=false origin pull/${{ github.event.pull_request.number }}/head git checkout master git merge --ff-only base_branch else