Follow-up from "Abort auto merges when the target branch of an MR is updated"
The following discussions from !153070 (merged) should be addressed:
-
@patrickbajao started a discussion: (+3 comments) Should we only enable this if
merge_when_checks_pass
FF is enabled? So this will only take effect when we roll out the FF.- @hfyngvason noted that this issue probably already affects other merge methods, such as MWPS.
-
@hfyngvason started a discussion: (+2 comments) Not blocking: Thought of a couple of edge cases:
- Doesn't this mean that if I create an MR with the default branch as the source branch and merge it into my development branch, then I will abort all auto merges at once?
- Also, what about workflows with multiple stable branches, e.g.
develop
andproduction
, where MRs targetdevelop
but routinely merge intoproduction
using merge requests to ensure some pre-flight checks in CI? Wouldn't everydevelop -> production
sync cause every auto-merge intodevelop
to cancel? This seems like a bit of an edge case, and it can be trivially worked around by using an intermediate branch, i.e.develop -> (create branch) release/xyz -> (merge MR) production
, but it might disrupt some workflows🤔
If these are important, then we may need to restrict the cancellation to:
- If the source branch of the just-merged MR is set to be deleted, then all targeting MRs
- Otherwise, only MRs with an explicit dependency relation
What do you think?
-
@hfyngvason started a discussion: Not blocking: This is good enough for now, but I think this can actually be a hyperlink.
Edited by Marc Shaw