From 9169620c5e7ce315c5b381eedfd52aac4ad18d52 Mon Sep 17 00:00:00 2001 From: Greg Estren Date: Fri, 7 Jul 2023 07:11:04 -0400 Subject: [PATCH] Remove merge markers --- .../google/devtools/build/lib/buildtool/ExecutionTool.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java index e17f68665d30f8..2971745d5c3a5a 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java @@ -781,11 +781,6 @@ private ImmutableList createConvenienceSymlinks( if (requestedTargetConfigs.size() == 1) { // All top-level targets have the same configuration, so use that one. targetConfigs = requestedTargetConfigs; -<<<<<<< HEAD - } else if (requestedTargetConfigs.contains(configuration)) { - // Mixed configs but at least one of them includes the top-level config. Set symlinks to the - // top-level config so at least non-transitioned targets resolve. See -======= } else if (requestedTargetConfigs.stream() .anyMatch( c -> c.getOutputDirectoryName().equals(configuration.getOutputDirectoryName()))) { @@ -793,7 +788,6 @@ private ImmutableList createConvenienceSymlinks( // mean it's the same as the top-level config: --trim_test_configuration means non-test // targets use the default output path but lack the top-level config's TestOptions). Set // symlinks to the top-level config so at least non-transitioned targets resolve. See ->>>>>>> ea02ba53fc (Adjust --top_level_targets_for_symlinks.) // https://github.com/bazelbuild/bazel/issues/17081. targetConfigs = ImmutableSet.of(configuration); } else {