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.
1006ada458Nathan Sobo committed on 1/4/2023, 8:59:16 PMparent789bbf1
1 file changedLine totals unavailable