Failed to auto-merge envoyproxy/envoy[release/v1.32] into envoyproxy/envoy-openssl[release/v1.32]

Upstream : 5e6a5af410774f94b7dc90568dcf8e5b71cae447
Downstream : 6658e50309bfc4b030f85eef8b953a81136ff89d

Auto-merging .bazelrc
Auto-merging VERSION.txt
CONFLICT (content): Merge conflict in VERSION.txt
Auto-merging bazel/repositories.bzl
Auto-merging ci/do_ci.sh
warning: Cannot merge binary files: docs/inventories/v1.29/objects.inv (HEAD vs. upstream/release/v1.32)
Auto-merging docs/inventories/v1.29/objects.inv
CONFLICT (content): Merge conflict in docs/inventories/v1.29/objects.inv
warning: Cannot merge binary files: docs/inventories/v1.30/objects.inv (HEAD vs. upstream/release/v1.32)
Auto-merging docs/inventories/v1.30/objects.inv
CONFLICT (content): Merge conflict in docs/inventories/v1.30/objects.inv
warning: Cannot merge binary files: docs/inventories/v1.31/objects.inv (HEAD vs. upstream/release/v1.32)
Auto-merging docs/inventories/v1.31/objects.inv
CONFLICT (content): Merge conflict in docs/inventories/v1.31/objects.inv
warning: Cannot merge binary files: docs/inventories/v1.32/objects.inv (HEAD vs. upstream/release/v1.32)
Auto-merging docs/inventories/v1.32/objects.inv
CONFLICT (add/add): Merge conflict in docs/inventories/v1.32/objects.inv
Auto-merging docs/versions.yaml
CONFLICT (content): Merge conflict in docs/versions.yaml
Auto-merging source/common/runtime/runtime_features.cc
Auto-merging test/extensions/filters/http/wasm/BUILD
Auto-merging test/integration/BUILD
Automatic merge failed; fix conflicts and then commit the result.

auto-merge envoyproxy/envoy[release/v1.32] into envoyproxy/envoy-openssl[release/v1.32] failed #290

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions