Record file root sync conflicts

crates/geth-control/src/lib.rs

@@ -465,6 +465,7 @@ pub enum ControlResponse {
         name: String,
         root: Option<FileRoot>,
         tree_bytes_imported: bool,
+        sync_conflicts: Vec<FileConflict>,
         allowed: bool,
         reason: String,
         note: String,
@@ -1654,6 +1655,7 @@ mod tests {
             name: "notes".to_owned(),
             root: None,
             tree_bytes_imported: false,
+            sync_conflicts: Vec::new(),
             allowed: false,
             reason: "no grant".to_owned(),
             note: "file-root sync".to_owned(),