Fix conflict state (was broken by merge conflict)

zed-industries · Feb 21, 2025 · 49cf9b9 · 49cf9b9
1 parent c31c638
commit 49cf9b9
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
@@ -5472,6 +5472,9 @@ impl BackgroundScanner {
                         },
                         &(),
                     );
+                    if status.is_conflicted() {
+                        repository.current_merge_conflicts.insert(repo_path.clone());
+                    }
 
                     if let Some(path) = project_path {
                         changed_paths.push(path);