Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimistic conflicts resolution mecanism #772

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Commits on Nov 29, 2023

  1. [feat] add a simple conflict resolution mecanism.

    The server tries to merge conflicting saves of
    the same layer.
    
    What it does:
    
    - use the `If-Unmodified-Since` header to check
      if changes happened to the stored data ;
    - Compare the incoming version with its reference version
      to get a diff.
    - Reapply the diff on top of the latest version.
    - If the merge is not possible, return a
      "422 Conflict" HTTP response.
    - If the merge worked, return the merged document,
      to be updated by the client.
    almet committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    f37ed70 View commit details
    Browse the repository at this point in the history