Handle branch divergence in prefixed security mirrors
As part of gitlab-org/release&14 (closed), we've got forks in the gitlab-org/security
group using pull mirroring with a security/
branch prefix to stay in sync.
However, security fixes will be merged into security/master
, causing a divergence. We want to avoid this using merge-train to bring the master
branch into security/branch
, either alerting loudly on conflicts, or favoring the version in security/master
.
This issue continues #472 (closed)