fix(ci): yet another 6356 follow-up

This commit is contained in:
UdjinM6 2024-10-24 23:05:43 +03:00
parent 1a5bbd8cd7
commit e646fa89f0
No known key found for this signature in database
GPG Key ID: 83592BD1400D58D9

View File

@ -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