upstream-merge.md

[jesusr@camaro ocp-release-operator-sdk{release-4.12}]$ ./UPSTREAM-MERGE.sh v1.25.4 release-4.12
Already on 'release-4.12'
Your branch is up to date with 'openshift/release-4.12'.
Already up to date.
Switched to a new branch 'v1.25.4-rebase-release-4.12'
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging testdata/ansible/memcached-operator/Dockerfile
CONFLICT (content): Merge conflict in testdata/ansible/memcached-operator/Dockerfile
Auto-merging testdata/ansible/memcached-operator/Makefile
CONFLICT (content): Merge conflict in testdata/ansible/memcached-operator/Makefile
Auto-merging testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml
CONFLICT (content): Merge conflict in testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml
Auto-merging testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml
CONFLICT (content): Merge conflict in testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml
Auto-merging testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml
CONFLICT (content): Merge conflict in testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml
Auto-merging testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml
CONFLICT (content): Merge conflict in testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml
Auto-merging testdata/go/v3/memcached-operator/config/scorecard/patches/basic.config.yaml
CONFLICT (content): Merge conflict in testdata/go/v3/memcached-operator/config/scorecard/patches/basic.config.yaml
Auto-merging testdata/go/v3/memcached-operator/config/scorecard/patches/olm.config.yaml
CONFLICT (content): Merge conflict in testdata/go/v3/memcached-operator/config/scorecard/patches/olm.config.yaml
Auto-merging testdata/go/v4-alpha/memcached-operator/bundle/tests/scorecard/config.yaml
CONFLICT (content): Merge conflict in testdata/go/v4-alpha/memcached-operator/bundle/tests/scorecard/config.yaml
Auto-merging testdata/go/v4-alpha/memcached-operator/config/scorecard/patches/basic.config.yaml 
CONFLICT (content): Merge conflict in testdata/go/v4-alpha/memcached-operator/config/scorecard/patches/basic.config.yaml
Auto-merging testdata/go/v4-alpha/memcached-operator/config/scorecard/patches/olm.config.yaml
CONFLICT (content): Merge conflict in testdata/go/v4-alpha/memcached-operator/config/scorecard/patches/olm.config.yaml
Auto-merging testdata/helm/memcached-operator/Dockerfile
CONFLICT (content): Merge conflict in testdata/helm/memcached-operator/Dockerfile
Auto-merging testdata/helm/memcached-operator/Makefile
CONFLICT (content): Merge conflict in testdata/helm/memcached-operator/Makefile
Auto-merging testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml
CONFLICT (content): Merge conflict in testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml
Auto-merging testdata/helm/memcached-operator/config/scorecard/patches/basic.config.yaml
CONFLICT (content): Merge conflict in testdata/helm/memcached-operator/config/scorecard/patches/basic.config.yaml
Auto-merging testdata/helm/memcached-operator/config/scorecard/patches/olm.config.yaml
CONFLICT (content): Merge conflict in testdata/helm/memcached-operator/config/scorecard/patches/olm.config.yaml
Auto-merging website/content/en/docs/installation/_index.md
CONFLICT (content): Merge conflict in website/content/en/docs/installation/_index.md
Automatic merge failed; fix conflicts and then commit the result.
go: updates to go.mod needed; to update it:
        go mod tidy
[v1.25.4-rebase-release-4.12 09dc7f18f] Merge upstream tag v1.25.4
f0a975ce1 (tag: v1.25.4, upstream/v1.25.x, upstream/latest) Release v1.25.4 (#6267)
63935a4e7 updated code and made state as pass and throw suggestion instead of error for missing spec in CR. (#6245) (#6266)
004f99571 bump helm and helm-operator-plugins (#6243) (#6265)
eb3757969 (bugfix): bump operator-framework/api dependency version (#6227) (#6263)
021ea07ac (bugfix): OCPBUGS-3072 - fix `operator-sdk run bundle(-upgrade)` PSA related issues (#6210) (#6261)
b24bd9f43 (bugfix): update run bundle(-upgrade) logic (#6182) (#6262)
5779ad7c8 (tag: v1.25.3) Release v1.25.3 (#6209)
071ba437c update ansible operator images (#6206)
417c3dcd7 docs/upgrade-sdk-version/v1.3.0.md: correct link to migration guide (#6207)
b63b92183 (tag: v1.25.2) Release v1.25.2 (#6178)
34ab17f3e [v1.25.x] (chore): bump ubi(-minimal) to 8.7 (#6177)
162690ff2 (tag: v1.25.1) Update the keys and script one more time (#6163)
51b759151 Fix secring. Signed with cncf key instead of mine. (#6161)
a30e6f0f9 Update gpg keys with new expiration date (#6152)
81b0a5e8c add --mode 700 to gpg directory creation (#6147)
8db8969c1 Release v1.25.1 (#6145)
d44ce8482 bump operator-framework/api to commit b611f6cef49cb8c6d621145c4e31d8ddfd4c59f4 (#6123)

** Upstream merge complete! **
View the above incoming commits to verify all is well
(mirrors the commit listing the PR will show)

Now make a pull request.