With the new automation in place via rhods-devops-infra , we always ensure that downstream is behind upstream in commits. This opens us up to potential future issues where we may need to add changes specific to downstream that don't need to go upstream. We do not have a strategy around this, the purpose of this task is to have plan/process in place to resolve these sorts of issues, confer with devops team on their plan to handle this.

Some additional context for discussion around this in slack: https://redhat-internal.slack.com/archives/C03UA0RLSQM/p1682626169732479