From 1006ada4584f42d270e11b1f6ae1806ccd71b8db Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 4 Jan 2023 13:59:16 -0700
Subject: [PATCH] Update scan_id on worktree entries when there is a conflict

Forgetting to do this meant we were unable to sync changes with reconnecting
guests in some cases.
---
 crates/collab/src/db.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 822b2dc762..1bbfac85d3 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -2184,6 +2184,7 @@ impl Database {
                         worktree_entry::Column::MtimeNanos,
                         worktree_entry::Column::IsSymlink,
                         worktree_entry::Column::IsIgnored,
+                        worktree_entry::Column::ScanId,
                     ])
                     .to_owned(),
                 )