Skip to content

pkg-merge-upstream-to-downstreams: Don't automerge on conflicts

Do not enable merge_when_pipeline_succeeds when the update pipeline failed to merge and a MR with the unmerged branch is created.

Otherwise the MR will unexpectedly be merged immediately as soon as the pipeline succeeds when someone pushes the manually resolved merge.

Edited by Emanuele Aina

Merge request reports