From e646fa89f01fd2424993700154c828f84c43fb2c Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Thu, 24 Oct 2024 23:05:43 +0300 Subject: [PATCH] fix(ci): yet another 6356 follow-up --- .github/workflows/merge-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-check.yml b/.github/workflows/merge-check.yml index 7da69d75b4..73757d7dc6 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