Fix merge conflict causing CLI lifetime to be wrong

packages/cli/src/serve/handle.rs

@@ -195,7 +195,7 @@ impl AppHandle {
 
         // The asset might've been renamed thanks to the manifest, let's attempt to reload that too
         if let Some(resource) = self.app.app.assets.assets.get(&changed_file).as_ref() {
-            let res = std::fs::copy(changed_file, asset_dir.join(resource.bundled_path()));
+            let res = std::fs::copy(&changed_file, asset_dir.join(resource.bundled_path()));
             bundled_name = Some(PathBuf::from(resource.bundled_path()));
             if let Err(e) = res {
                 tracing::debug!("Failed to hotreload asset {e}");
@@ -209,7 +209,7 @@ impl AppHandle {
                 tracing::debug!("Pushing asset to device: {target}");
                 let res = tokio::process::Command::new("adb")
                     .arg("push")
-                    .arg(changed_file)
+                    .arg(&changed_file)
                     .arg(target)
                     .output()
                     .await