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

After merge, remove segment item of id that doesn't exist anymore #7729

Merged
merged 9 commits into from
Apr 8, 2024
Merged

After merge, remove segment item of id that doesn't exist anymore #7729

merged 9 commits into from
Apr 8, 2024

Commits on Mar 27, 2024

  1. after merge, remove segment item of id that doesn't exist anymore

    @philippotto
    philippotto committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    c4ccfe5 View commit details
    Browse the repository at this point in the history

  2. update changelog

    @philippotto
    philippotto committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    82a335e View commit details
    Browse the repository at this point in the history

  3. remove Maybe usage from mergeTrees reducer helper

    @philippotto
    philippotto committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    d7dcc41 View commit details
    Browse the repository at this point in the history

  4. swap source and target in mergeTreesAction so that it is consistent w… 

    …ith proofread merging (the active tree/segment should always survive the merge operation)
    @philippotto
    philippotto committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    77f429a View commit details
    Browse the repository at this point in the history

  5. update changelog

    @philippotto
    philippotto committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    8cf90a0 View commit details
    Browse the repository at this point in the history

  6. fix tests

    @philippotto
    philippotto committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    c834ea2 View commit details
    Browse the repository at this point in the history

  7. fix tests (II)

    @philippotto
    philippotto committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    6187530 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Update CHANGELOG.unreleased.md 

    Co-authored-by: Daniel <daniel.werner@scalableminds.com>
    @philippotto @daniel-wer
    philippotto and daniel-wer committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    5d3e263 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into remove-segment-after-merge

    @philippotto
    philippotto committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    cbeff64 View commit details
    Browse the repository at this point in the history