Skip to content

Skip conflict check when adding to merge train on pipeline success

Hordur Freyr Yngvason requested to merge skip-conflict-check-when-adding-to-merge-train-on-pipeline-success into master

What does this MR do and why?

Fixes a bug in which an in-progress git conflict check could cause a merge train to incorrectly get removed from the merge train, if the git conflict just happened to be in progress at the same time as when auto merge was adding the MR to the train after a successful pipeline.

See #466033 (closed)

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After

How to set up and validate locally

In a project with merge trains enabled:

  1. Open a merge request
  2. Start a pipeline
  3. Set Add to merge train when pipeline succeeds
  4. Navigate away from the page
  5. Push some non-conflicting change to the MR's target branch (typically main or master)
  6. Wait for the pipeline to complete

Before this change: Auto-merge gets cancelled

After this change: The merge request gets added to the train and then merged

Edited by Hordur Freyr Yngvason

Merge request reports