auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main] failed

tedjpoole / test-downstream

Apache License 2.0

0 stars 0 forks source link

auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main] failed #15

Open test-envoy-sync-receive-app[bot] opened 3 weeks ago

test-envoy-sync-receive-app[bot] commented 3 weeks ago

auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main] failed

test-envoy-sync-receive-app[bot] commented 3 weeks ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 844c7c873faed3a6c492e57390cbcd1344b8a2ce Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 2 weeks ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 2e4ee89c085d2114945e677cf553c91dea046fc0 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 2 weeks ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : f86d1294e764af4429732d322c8a8a9fedead8a2 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 2 weeks ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 0b551a85b3fd5a425ee468209cf68d7ccc4fd3dd Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 2 weeks ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : b4e356885ef56134c3c8531d1c0d0f05a74151ad Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 2 weeks ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : ee6163435be32f0efd3ad068e90ea89c974991c3 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 2 weeks ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : ee6163435be32f0efd3ad068e90ea89c974991c3 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 2 weeks ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 871b3e91234d6e305d4ec653444f1d56b324a302 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 1 week ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 54d2ec9af11b3e0247fa6e02c182c1697faf2a75 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 1 week ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 5e94ec7c8bdb82cbf311bf252ef8657b1041fd69 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 1 week ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 6ccad8dd190d32dd04eaa0175782acb820d5eab6 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 1 week ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 3c773f832394f196e3a53d94ccb85558a9e02872 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 1 week ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 4f88be154c86d40141b0d334d04dc69fa80e010c Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 1 week ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 8ffdf9857801e53428c6e13757ef113648fcbd2a Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 1 week ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 8ffdf9857801e53428c6e13757ef113648fcbd2a Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 6 days ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : cadbc9b58e73d3a893a1ccb4cfca51d311c9e1db Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (content): Merge conflict in .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
Auto-merging .github/workflows/_precheck_publish.yml
CONFLICT (content): Merge conflict in .github/workflows/_precheck_publish.yml
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 5 days ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : cd26f86efdca3e336ba57cd4f38cee8e948c054f Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (content): Merge conflict in .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
Auto-merging .github/workflows/_precheck_publish.yml
CONFLICT (content): Merge conflict in .github/workflows/_precheck_publish.yml
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 4 days ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : f4dd0337e5d553e14045bfe7037a44b14a370e15 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (content): Merge conflict in .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
Auto-merging .github/workflows/_precheck_publish.yml
CONFLICT (content): Merge conflict in .github/workflows/_precheck_publish.yml
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 3 days ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 12e9d3badc5692c0c2f5fdfe02f734a7f0a1f1e4 Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (content): Merge conflict in .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
Auto-merging .github/workflows/_precheck_publish.yml
CONFLICT (content): Merge conflict in .github/workflows/_precheck_publish.yml
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 2 days ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : 72b75074a0ee089ad81f68ae011e31f14c2936fe Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (content): Merge conflict in .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
Auto-merging .github/workflows/_precheck_publish.yml
CONFLICT (content): Merge conflict in .github/workflows/_precheck_publish.yml
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 1 day ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : fcdc9d6d5a9da98fe30ad749201034770ff6b30e Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (content): Merge conflict in .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
Auto-merging .github/workflows/_precheck_publish.yml
CONFLICT (content): Merge conflict in .github/workflows/_precheck_publish.yml
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

test-envoy-sync-receive-app[bot] commented 20 hours ago

Failed to auto-merge envoyproxy/envoy[main] into tedjpoole/test-downstream[main]

Upstream : fcdc9d6d5a9da98fe30ad749201034770ff6b30e Downstream : 276dcf57a4e6242e48dcd6a992480e7947c47550

CONFLICT (modify/delete): .github/workflows/_cache.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_cache.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_check_build.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_build.yml left in tree.
Auto-merging .github/workflows/_check_coverage.yml
CONFLICT (content): Merge conflict in .github/workflows/_check_coverage.yml
CONFLICT (modify/delete): .github/workflows/_check_san.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_check_san.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_finish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_finish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_load_env.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_load_env.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_precheck_deps.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_precheck_deps.yml left in tree.
Auto-merging .github/workflows/_precheck_publish.yml
CONFLICT (content): Merge conflict in .github/workflows/_precheck_publish.yml
CONFLICT (modify/delete): .github/workflows/_publish_publish.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_publish_publish.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_request.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_request.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_run.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_run.yml left in tree.
CONFLICT (modify/delete): .github/workflows/_start.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/_start.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-release.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/mobile-traffic_director.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/mobile-traffic_director.yml left in tree.
CONFLICT (modify/delete): .github/workflows/pr_notifier.yml deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/workflows/pr_notifier.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.