Split conflicts into their own section (#24324)

Co-Authored-By: Mikayla <mikayla@zed.dev> Release Notes: - N/A
2025-02-05 18:34:14 -07:00
parent 5d1c56829a
commit 0a70627f00
13 changed files with 171 additions and 42 deletions
@@ -336,6 +336,12 @@ impl Repository {
        self.repository_entry.status()
    }

+    pub fn has_conflict(&self, path: &RepoPath) -> bool {
+        self.repository_entry
+            .current_merge_conflicts
+            .contains(&path)
+    }
+
    pub fn repo_path_to_project_path(&self, path: &RepoPath) -> Option<ProjectPath> {
        let path = self.repository_entry.unrelativize(path)?;
        Some((self.worktree_id, path).into())