From edcde6d90c4a82a3ab64dda91e56bafaded28bc5 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 17 Dec 2025 09:28:59 +0100
Subject: [PATCH] Fix semantic merge conflict (#45078)

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/project/src/trusted_worktrees.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/project/src/trusted_worktrees.rs b/crates/project/src/trusted_worktrees.rs
index d9f5d4a7a43d8cb8b8220f4d3de8ca35d366a8f5..9f849ceaf1db62c1a88e269565e95bc97bc56011 100644
--- a/crates/project/src/trusted_worktrees.rs
+++ b/crates/project/src/trusted_worktrees.rs
@@ -223,7 +223,7 @@ impl From<RemoteConnectionOptions> for RemoteHostLocation {
         let (user_name, host_name) = match options {
             RemoteConnectionOptions::Ssh(ssh) => (
                 ssh.username.map(SharedString::new),
-                SharedString::new(ssh.host),
+                SharedString::new(ssh.host.to_string()),
             ),
             RemoteConnectionOptions::Wsl(wsl) => (
                 wsl.user.map(SharedString::new),