gistfile1.md

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: downloading github.com/operator-framework/api v0.17.4-0.20221221181915-f1b729684854
go: downloading github.com/operator-framework/helm-operator-plugins v0.0.12-0.20230109213218-ebfbea851192
go: downloading helm.sh/helm/v3 v3.10.3
go: updates to go.mod needed; to update it:
        go mod tidy
[v1.25.4-rebase-release-4.12 ac0894893] Merge upstream tag v1.25.4
fatal: Not a valid object name origin/release-4.12

** 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.```