Near the end of security release, sometimes conflicts emerge, release tools should handle this for me
Nearing the end of 14.9.2, we ran into a conflict when the default branches were being merged. Release-tools currently does not handle this well, and simply stops. It'd be neat if there were a way to open a MR, which contains the conflict, for which we could then send the MR to an appropriate engineer to assist us with resolving the conflict. Bonus points if we can figure out how to avoid the lengthy 2+ hour pipelines associated with this that way our procedure isn't help up for multiple hours.
Reference from 14.9.2: gitlab-org/gitlab!84094 (merged)