Skip to content

Commit 7fa9437

Browse files
authored
Update SYNCING-PROTOCOL.md
1 parent 74781ef commit 7fa9437

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

docs/SYNCING-PROTOCOL.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ sequenceDiagram
201201
The client has determined that it needs to upload the local Client copy of an Entity. This is either because the server is missing the entity, or the client has a dirty copy that needs to be synchronized.
202202

203203
#### No conflict
204-
In the nominal case, the server will accept the incoming entity, and simply overwrite the Server's own copy with it. The server knows this is safe to due because it compares the Server copy's hash, with the provided `original hash`. If they match, the Server knows that the Client was editing the same copy which the server will now replace.
204+
In the nominal case, the server will accept the incoming entity, and simply overwrite the Server's own copy with it. The server knows this is safe to do so because it compares the Server copy's hash, with the provided `original hash`. If they match, the Server knows that the Client was editing the same copy which the server will now replace.
205205
```mermaid
206206
sequenceDiagram
207207
participant Client
@@ -220,7 +220,7 @@ sequenceDiagram
220220
#### Conflict detected
221221
In the case where the Sever and Client's `original hash` do no match, there is a conflict.
222222

223-
The server infers from this that the client was editing a different version of the Entity that what the server now has. This is probably because a different client uploaded an independent edit of the Entity.
223+
The server infers from this that the client was editing a different version of the Entity than what the server now has. This is probably because a different client uploaded an independent edit of the Entity.
224224

225225
The server will respond with it's copy of the Entity and require the Client to resolve the conflict by resubmitting the upload with `force=true` set.
226226
```mermaid
@@ -248,7 +248,7 @@ sequenceDiagram
248248
activate Client
249249
Note left of Server: SaveEntityResponse
250250
```
251-
Note that the resolved `ApiProjectEntity` in the `force` request does not have to be exclusively the Client's or Server's, it can be a merging between the two that the client helped the user create.
251+
Note that the resolved `ApiProjectEntity` in the `force` request does not have to be exclusively the Client's or Server's copy, it can be a merging between the two that the client helped the user create.
252252

253253
## Client Operations Sequence
254254
Beyond the network side of the Protocol, the Client is doing a bit of work to ensure data loss is not possible, and to work out what should be done with the minimal book keeping data it has.

0 commit comments

Comments
 (0)