Skip to content

Add merge-train consideration on broken-master process

Mayra Cabrera requested to merge add-merge-train-consideration-to-broken-master-process into main

Why is this change being made?

To alleviate production incidents, urgent merge requests can be merged during a broken-master incident without waiting for a green pipeline https://handbook.gitlab.com/handbook/engineering/workflow/#criteria-for-merging-during-broken-master.

With the merge-train functionality enabled, a warning is displayed stating the immediate merge can alter the behavior of the merge-train. This commit updates the "How to request a merge during a broken master" section to state that when the merge-train is enabled it is okay to dismiss the warning to merge urgent merge requests.

The warning description was also updated on gitlab-org/gitlab!157533 to explain the consequences of disabling the merge request.

Related to gitlab-org/quality/engineering-productivity/team#513 (comment 1949787191)

Author and Reviewer Checklist

Please verify the check list and ensure to tick them off before the MR is merged.

  • Provided a concise title for this Merge Request (MR)
  • Added a description to this MR explaining the reasons for the proposed change, per say why, not just what
    • Copy/paste the Slack conversation to document it for later, or upload screenshots. Verify that no confidential data is added, and the content is SAFE
  • Assign reviewers for this MR to the correct Directly Responsible Individual/s (DRI)
    • If the DRI for the page/s being updated isn’t immediately clear, then assign it to one of the people listed in the Maintained by section on the page being edited
    • If your manager does not have merge rights, please ask someone to merge it AFTER it has been approved by your manager in #mr-buddies
    • The when to get approval handbook section explains the workflow in more detail
  • For transparency, share this MR with the audience that will be impacted.
    • Team: For changes that affect your direct team, share in your group Slack channel
    • Department: If the update affects your department, share the MR in your department Slack channel
    • Division: If the update affects your division, share the MR in your division Slack channel
    • Company: If the update affects all (or the majority of) GitLab team members, post an update in #whats-happening-at-gitlab linking to this MR
Edited by Mayra Cabrera

Merge request reports