fix backport conflicts

Author: HoloRin

bazel/platforms/BUILD.bazel

@@ -51,24 +51,12 @@ platform(
     name = "erlang_linux_25_3_platform",
     constraint_values = [
         "@erlang_config//:erlang_25_3",
-        "@elixir_config//:elixir_1_14",
-    ],
-    parents = ["@rbe//config:platform"],
-)
-
-platform(
-<<<<<<< HEAD
-=======
-    name = "erlang_linux_26_platform",
-    constraint_values = [
-        "@erlang_config//:erlang_26",
         "@elixir_config//:elixir_1_15",
     ],
     parents = ["@rbe//config:platform"],
 )
 
 platform(
->>>>>>> ba57c77a62 (Add elixir 1.15 and use with otp 26)
     name = "erlang_linux_git_master_platform",
     constraint_values = [
         "@erlang_config//:erlang_26_unknown",

deps/rabbitmq_cli/BUILD.bazel

@@ -78,38 +78,6 @@ rabbitmq_run(
     visibility = ["//visibility:public"],
 )
 
-<<<<<<< HEAD
-=======
-rabbitmqctl_check_formatted_test(
-    name = "check_formatted",
-    size = "small",
-    srcs = [
-        ".formatter.exs",
-        "config/config.exs",
-        "mix.exs",
-    ] + glob([
-        "lib/**/*.ex",
-        "test/**/*.exs",
-    ]),
-    data = glob(["test/fixtures/**/*"]),
-    target_compatible_with = select({
-        "@platforms//os:macos": [
-            "@platforms//os:macos",
-            "@elixir_config//:elixir_1_15",
-        ],
-        "//conditions:default": [
-            "@platforms//os:linux",
-            "@elixir_config//:elixir_1_15",
-        ],
-    }),
-)
-
-test_suite(
-    name = "rabbitmqctl_check_formatted",
-    tests = ["check_formatted"],
-)
-
->>>>>>> 7d9ea24eb2 (Run cli format check on elixir 1.15 only)
 plt(
     name = "deps_plt",
     apps = [

deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/remote_shell_command.ex

@@ -18,19 +18,7 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.RemoteShellCommand do
     if :erlang.function_exported(:shell, :start_interactive, 1) do
       start_shell_on_otp_26_plus(node_name)
     else
-<<<<<<< HEAD
-      _ = Supervisor.terminate_child(:kernel_sup, :user)
-      Process.flag(:trap_exit, true)
-      user_drv = :user_drv.start([~c"tty_sl -c -e", {node_name, :shell, :start, []}])
-      Process.link(user_drv)
-
-      receive do
-        {~c"EXIT", _user_drv, _} ->
-          {:ok, "Disconnected from #{node_name}."}
-      end
-=======
       start_shell_on_otp_25(node_name)
->>>>>>> 45ba92e096 (Sync remote_shell with main for OTP 25/26 compat)
     end
   end
 
@@ -67,4 +55,4 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.RemoteShellCommand do
         {:ok, "Disconnected from #{node_name}."}
     end
   end
-end
+end

deps/rabbitmq_cli/test/ctl/enable_feature_flag_test.exs

@@ -19,11 +19,7 @@ defmodule EnableFeatureFlagCommandTest do
 
     new_feature_flags = %{
       @feature_flag => %{
-<<<<<<< HEAD
-        desc: "My feature flag",
-=======
         desc: ~c"My feature flag",
->>>>>>> 65a3f77932 (Run 'mix format' with elixir 1.15.2)
         provided_by: :EnableFeatureFlagCommandTest,
         stability: :stable
       }

deps/rabbitmq_cli/test/ctl/list_feature_flags_command_test.exs

@@ -21,20 +21,12 @@ defmodule ListFeatureFlagsCommandTest do
 
     new_feature_flags = %{
       @flag1 => %{
-<<<<<<< HEAD
-        desc: "My feature flag #1",
-=======
         desc: ~c"My feature flag #1",
->>>>>>> 65a3f77932 (Run 'mix format' with elixir 1.15.2)
         provided_by: :ListFeatureFlagsCommandTest,
         stability: :stable
       },
       @flag2 => %{
-<<<<<<< HEAD
-        desc: "My feature flag #2",
-=======
         desc: ~c"My feature flag #2",
->>>>>>> 65a3f77932 (Run 'mix format' with elixir 1.15.2)
         provided_by: :ListFeatureFlagsCommandTest,
         stability: :stable
       }