fix(ci): yet another 6356 follow-up

dashpay · Oct 24, 2024 · e646fa8 · e646fa8
1 parent 1a5bbd8
commit e646fa8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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