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: omit unmodified files during merge write #1969

Merged
merged 14 commits into from
Dec 30, 2023
Merged

feat: omit unmodified files during merge write #1969

merged 14 commits into from
Dec 30, 2023
+821 −81

Commits on Dec 11, 2023

  1. :WIP: implement merge without full rewrite

    @Blajda
    Blajda committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    755e4c4 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Merge remote-tracking branch 'origin/main' into merge-barrier

    @Blajda
    Blajda committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    9111498 View commit details
    Browse the repository at this point in the history

  2. remove debug + print statements

    @Blajda
    Blajda committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    6d43a82 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. minimize hashing performed in barrier

    @Blajda
    Blajda committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    09399fd View commit details
    Browse the repository at this point in the history

  2. add comments

    @Blajda
    Blajda committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    2b27ef9 View commit details
    Browse the repository at this point in the history

  3. fix merge test

    @Blajda
    Blajda committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    f5c32e0 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2023

  1. refactor & add barrier tests

    @Blajda
    Blajda committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    9f04d77 View commit details
    Browse the repository at this point in the history

  2. organize merge file structure

    @Blajda
    Blajda committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    9a94da9 View commit details
    Browse the repository at this point in the history

  3. remove unwraps

    @Blajda
    Blajda committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    9434f56 View commit details
    Browse the repository at this point in the history

  4. fix merge append test

    @Blajda
    Blajda committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    1e7a946 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/main' into merge-barrier

    @Blajda
    Blajda committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    a5ecd95 View commit details
    Browse the repository at this point in the history

  6. remove unneed df config

    @Blajda
    Blajda committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    51a4d70 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. merge main

    @Blajda
    Blajda committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    9884480 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. Merge branch 'main' into merge-barrier

    @Blajda
    Blajda authored Dec 29, 2023
    Configuration menu
    Copy the full SHA
    102f201 View commit details
    Browse the repository at this point in the history