Questions about Syncing

Hey there, I’m just curious about how syncing works.

I see that you keep track of text diffs for version history, but what happens when there is a merge conflict when two devices write to the same file? How is this reconciled?

I think that this is still the most relevant answer to how conflicts are handled.