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
@@ -134,7 +134,11 @@ impl FileStatus {
    }

    pub fn has_changes(&self) -> bool {
-        self.is_modified() || self.is_created() || self.is_deleted() || self.is_untracked()
+        self.is_modified()
+            || self.is_created()
+            || self.is_deleted()
+            || self.is_untracked()
+            || self.is_conflicted()
    }

    pub fn is_modified(self) -> bool {