From e890933e859ede84130190b1b55829aa7d6f113a Mon Sep 17 00:00:00 2001
From: andrussal <salumets.andrus@gmail.com>
Date: Sun, 8 Mar 2026 15:06:38 +0100
Subject: [PATCH] Align attach wording with existing-cluster mode

---
 .../deployers/compose/src/deployer/orchestrator.rs             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/testing-framework/deployers/compose/src/deployer/orchestrator.rs b/testing-framework/deployers/compose/src/deployer/orchestrator.rs
index 554db9b..452867a 100644
--- a/testing-framework/deployers/compose/src/deployer/orchestrator.rs
+++ b/testing-framework/deployers/compose/src/deployer/orchestrator.rs
@@ -372,6 +372,7 @@ impl<E: ComposeDeployEnv> DeploymentOrchestrator<E> {
     }
 }
 
+<<<<<<< HEAD
 fn validate_supported_cluster_mode<E: Application, Caps>(
     scenario: &Scenario<E, Caps>,
 ) -> Result<(), DynError> {
@@ -421,6 +422,8 @@ mod tests {
         );
     }
 }
+=======
+>>>>>>> 5baf93d (Align attach wording with existing-cluster mode)
 fn existing_cluster_metadata<E, Caps>(scenario: &Scenario<E, Caps>) -> ComposeDeploymentMetadata
 where
     E: ComposeDeployEnv,