From 6516249302a3f6e7c311ca58414b096219d301e1 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 24 Feb 2025 10:52:42 -0700
Subject: [PATCH] Fix conflict state (was broken by merge conflict) (#25354)

Closes #ISSUE

Release Notes:

- N/A
---
 crates/worktree/src/worktree.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 402567cf8c..de8b052bd1 100644
--- 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);