Merge when pipeline complete + Require Fast-Forward doesn't revert to rebase needed when Fast-Forward is no longer possible after the pipeline completes.
Merge when pipeline complete + Require Fast-Forward doesn't call automatic merge and change back to rebase needed when Fast-Forward is no longer possible after another pipeline test/merge completes and merges.
To reproduce:
- turn on ff only merges for a repo
- create two branches with changes
- create two MRs (one for each branch). FF will be possible.
- schedule both to automatically merge while their pipelines are running
- one will merge
- the slower one will get stuck with the pipeline succeeding by no merge will happen and the automatic merge status will remain
Expected
- As soon as the first one succeeds the second one should revert to rebase needed.
Customers
Edited by 🤖 GitLab Bot 🤖