We merged this ART PR which bumps base images. And then bumper [reverted the changes here|https://github.com/openshift/operator-framework-operator-controller/pull/88/files].
I still see the ART bump commit in main, but there is "Add OpenShift specific files" commit on top of it with older images. Actually now we have two "Add OpenShift specific files" commits in main:
- https://github.com/openshift/operator-framework-operator-controller/commit/fbc2939bc1772c531b4a900d286226596fef4235
- https://github.com/openshift/operator-framework-operator-controller/commit/26bee9119a38542fbe7a96abc08f3ec391f540d0
And every UPSTREAM: <carry>-prefixed commit seems to be duplicated on top of synced changes.
Expected result:
- Bumper doesn't override/revert UPSTREAM: <carry>-prefixed commit contributed directly into the downstream repos. Order of UPSTREAM: <carry>-prefixed commits should be respected.
- links to