Fix broken merge train merge when target branch deleted
requested to merge 483097-mergetrain-car-target-branch-not-getting-updated-when-the-initial-target-branch-is-deleted-17-4 into 17-4-stable-ee
What does this MR do and why?
This is a backport of !165216 (merged), part of a series of fixes we've done related to merge trains getting stuck. The backport is for a critical-customer-escalation #500887
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch. -
The MR that fixed the bug on the default branch has been deployed to GitLab.com (not applicable for documentation or spec changes). -
This MR has a severity label assigned (if applicable). -
Set the milestone of the merge request to match the target backport branch version. -
This MR has been approved by a maintainer (only one approval is required). -
Ensure the e2e:test-on-omnibus-ee
job has either succeeded or been approved by a Software Engineer in Test.
Note to the merge request author and maintainer
If you have questions about the patch release process, please:
- Refer to the patch release runbook for engineers and maintainers for guidance.
- Ask questions on the
#releases
Slack channel (internal only).
Edited by Jenny Kim