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.

Sign up for GitHub

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

Jump to bottom

Handle strategy fallbacks properly #809

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Handle strategy fallbacks properly #809

merged 2 commits into from
Nov 10, 2023

Commits on Sep 21, 2023

  1. Handle strategy fallbacks properly 

    If strategy was set for server and not for client in a hash - that would lead to on_client_conflict to return a hash back. Which would in turn lead to an error in on_conflict.rb
    @matejrisek
    matejrisek committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    75bf4a9 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. Merge branch 'main' into fix/wrong-fallback-conflict-resolution-strat… 

    …egies
    @matejrisek
    matejrisek committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    a41d099 View commit details
    Browse the repository at this point in the history