Improve large diff and merge conflict workflows

app/src/remote_server/diff_state_proto.rs

@@ -263,6 +263,7 @@ impl TryFrom<&proto::FileDiff> for FileDiff {
             is_autogenerated: file.is_autogenerated,
             max_line_number: file.max_line_number as usize,
             has_hidden_bidi_chars: file.has_hidden_bidi_chars,
+            conflict_count: file.conflict_count as usize,
             size,
         })
     }
@@ -630,6 +631,7 @@ pub fn file_diff_to_proto(f: &FileDiff, content_at_base: Option<&str>) -> proto:
         is_autogenerated: f.is_autogenerated,
         max_line_number: f.max_line_number as u64,
         has_hidden_bidi_chars: f.has_hidden_bidi_chars,
+        conflict_count: f.conflict_count as u64,
         size: proto::DiffSize::from(&size).into(),
         content_at_base: content_at_base.map(|s| s.to_string()),
     }

app/src/remote_server/diff_state_proto_tests.rs

@@ -119,6 +119,7 @@ fn file_diff_to_proto_preserves_repo_relative_path() {
         is_autogenerated: false,
         max_line_number: 0,
         has_hidden_bidi_chars: false,
+        conflict_count: 0,
         size: DiffSize::Normal,
     };
 
@@ -138,6 +139,7 @@ fn build_diff_state_snapshot_preserves_repo_relative_file_paths() {
             is_autogenerated: false,
             max_line_number: 0,
             has_hidden_bidi_chars: false,
+            conflict_count: 0,
             size: DiffSize::Normal,
         },
         content_at_head: None,
@@ -187,6 +189,7 @@ fn text_file_diff(file_path: &str) -> FileDiff {
         is_autogenerated: false,
         max_line_number: 0,
         has_hidden_bidi_chars: false,
+        conflict_count: 0,
         size: DiffSize::Normal,
     }
 }