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

feat: Implement conflict reconciliation for private directories #431

Merged
merged 14 commits into from
Apr 25, 2024
Merged

feat: Implement conflict reconciliation for private directories #431

merged 14 commits into from
Apr 25, 2024

Commits on Apr 23, 2024

  1. feat: Implement conflict reconciliation for private directories

    @matheus23
    matheus23 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    b6475c5 View commit details
    Browse the repository at this point in the history

  2. fix: Make header public again

    @matheus23
    matheus23 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    b5d1e20 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. chore: write basic reconciliation unit tests

    @matheus23
    matheus23 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    9d8db74 View commit details
    Browse the repository at this point in the history

  2. chore: Write proptest state machine utilities & proptest private reco… 

    …nciliation
    @matheus23
    matheus23 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    bfb18a7 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. chore: Write better Debug impls

    @matheus23
    matheus23 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    31ebaa8 View commit details
    Browse the repository at this point in the history

  2. feat: Prioritize directories over files during private directory merge

    @matheus23
    matheus23 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    3cf7e74 View commit details
    Browse the repository at this point in the history

  3. chore: Try extracting out a failing testcase

    @matheus23
    matheus23 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    66ca128 View commit details
    Browse the repository at this point in the history

  4. fix: Regression test & mock file system merge

    @matheus23
    matheus23 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    92c968a View commit details
    Browse the repository at this point in the history

  5. chore: Found failing test case

    @matheus23
    matheus23 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    84b263b View commit details
    Browse the repository at this point in the history

  6. chore: Try associating replicas with a vector clock

    @matheus23
    matheus23 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    5ed453d View commit details
    Browse the repository at this point in the history

  7. refactor: Don't try to state machine proptest private reconciliation

    @matheus23
    matheus23 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    1b4e430 View commit details
    Browse the repository at this point in the history

  8. refactor: Remove unused dependency

    @matheus23
    matheus23 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    1c25fd4 View commit details
    Browse the repository at this point in the history

  9. feat: Commit Cargo.lock and update lockfile

    @matheus23
    matheus23 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    13bcec9 View commit details
    Browse the repository at this point in the history

  10. chore: docs

    @matheus23
    matheus23 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    41b105a View commit details
    Browse the repository at this point in the history