mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
fix(ci): yet another 6356 follow-up
This commit is contained in:
parent
1a5bbd8cd7
commit
e646fa89f0
2
.github/workflows/merge-check.yml
vendored
2
.github/workflows/merge-check.yml
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user