Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main] failed #294

Open
update-openssl-envoy bot opened this issue Jan 17, 2025 · 7 comments
Open

auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main] failed #294

update-openssl-envoy bot opened this issue Jan 17, 2025 · 7 comments

Comments

@update-openssl-envoy
Copy link

auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main] failed
@update-openssl-envoy
Copy link
Author

Failed to auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main]

Upstream : 3f3624f4ddcc1d44e2c21a4825b4a6ce6b2b3680
Downstream : 359eb83043717b274db02ba457d4ebeed33521bc

Auto-merging CODEOWNERS
CONFLICT (content): Merge conflict in CODEOWNERS
Automatic merge failed; fix conflicts and then commit the result.

@update-openssl-envoy
Copy link
Author

Failed to auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main]

Upstream : 9b4e4652c9d71351d02bca692d71419867cc3e00
Downstream : 359eb83043717b274db02ba457d4ebeed33521bc

Auto-merging CODEOWNERS
CONFLICT (content): Merge conflict in CODEOWNERS
Automatic merge failed; fix conflicts and then commit the result.

@update-openssl-envoy
Copy link
Author

Failed to auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main]

Upstream : 8ed2dc503b8f665345f013645e690a714a8f8036
Downstream : 359eb83043717b274db02ba457d4ebeed33521bc

Auto-merging CODEOWNERS
CONFLICT (content): Merge conflict in CODEOWNERS
Automatic merge failed; fix conflicts and then commit the result.

2 similar comments
@update-openssl-envoy
Copy link
Author

Failed to auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main]

Upstream : 8ed2dc503b8f665345f013645e690a714a8f8036
Downstream : 359eb83043717b274db02ba457d4ebeed33521bc

Auto-merging CODEOWNERS
CONFLICT (content): Merge conflict in CODEOWNERS
Automatic merge failed; fix conflicts and then commit the result.

@update-openssl-envoy
Copy link
Author

Failed to auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main]

Upstream : 8ed2dc503b8f665345f013645e690a714a8f8036
Downstream : 359eb83043717b274db02ba457d4ebeed33521bc

Auto-merging CODEOWNERS
CONFLICT (content): Merge conflict in CODEOWNERS
Automatic merge failed; fix conflicts and then commit the result.

@update-openssl-envoy
Copy link
Author

Failed to auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main]

Upstream : dc9aba820809eac557b255bbbf48b26b1dbc8b87
Downstream : 359eb83043717b274db02ba457d4ebeed33521bc

Auto-merging CODEOWNERS
CONFLICT (content): Merge conflict in CODEOWNERS
Automatic merge failed; fix conflicts and then commit the result.

@update-openssl-envoy
Copy link
Author

Failed to auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main]

Upstream : 41d8ccc79c4b98104475b55b5639567b14466190
Downstream : 359eb83043717b274db02ba457d4ebeed33521bc

Auto-merging CODEOWNERS
CONFLICT (content): Merge conflict in CODEOWNERS
Automatic merge failed; fix conflicts and then commit the result.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
0 participants