# Update scan_id on worktree entries when there is a conflict · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/1006ada4584f42d270e11b1f6ae1806ccd71b8db)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: 1006ada4584f42d270e11b1f6ae1806ccd71b8db

Requested commit: 1006ada4584f42d270e11b1f6ae1806ccd71b8db

Commit: 1006ada4584f42d270e11b1f6ae1806ccd71b8db

Tree: ffc063f16b2c06a50f7ee4ed279751b111d28bd8

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
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.

```

## Parents

- [789bbf15b7496e39962b750655f0a6b8ee91b1a5](https://git.cafe/gitcafe/zed/commit/789bbf15b7496e39962b750655f0a6b8ee91b1a5?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/1006ada4584f42d270e11b1f6ae1806ccd71b8db?format=markdown)