Skip to content

#392 Skip fusing if already made to fix infinite loop

Issue description:

marge-bot under its execution is trying to perform fusion by rebase strategy. Fusion fails because it was already, locally performed with git merge origin/main action (not by rebase). This results in fail of marge-bot flow which will be retried. Under retry error will happen again. This will be retried infinitely until execution achieve it's timeout

Solution description:

marge-bot before fusing, checks if it was already performed. If yes(no matter by which strategy) then it will continue it's execution but with fusing activity skipped

Tests:

!408 (comment 1519289572)

Edited by Arkadiusz Witek

Merge request reports