search

smarkets / marge-bot

A merge-bot for GitLab
BSD 3-Clause "New" or "Revised" License
696 stars 137 forks source link

Fix merging action when last source commit is not last target commit (gitlab_rebase) #379

Closed wites342 closed 1 year ago

wites342 commented 1 year ago

Detailed reason and fix description available under issue: [#378]

Fix: added check if target branch commit exist in source in earlier commits that last one

wites342 commented 1 year ago

@snim2 will be glad if you could review it. Tests described in issue #378

wites342 commented 1 year ago

Issue moved to marge-org comminity gitlab repository: https://gitlab.com/marge-org/marge-bot/-/issues/392 https://gitlab.com/marge-org/marge-bot/-/merge_requests/408